Skip to content

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

同步改动

parent 112fdeeb
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 39 deletions
common/api/api.js
View file @ f7ea0788
const baseUrl = 'https://r.ucaret.cn/test-api'; // 开发地/址
// const baseUrl = 'https://r.ucaret.cn/test-api'; // 开发地/址
// const baseUrl = 'http://5thcg5.natappfree.cc'; // 开发地址
// const baseUrl = 'https://jduniapp.uzosp.com'; // 线上地/址
const baseUrl = 'https://movecar.jd.com'; // 线上地址
const httpRequest = (opts, data) => {
let httpDefaultOpts = {
url: baseUrl + opts.url,
......
common/request/requestConfig.js
View file @ f7ea0788
......@@ -4,7 +4,7 @@ import request from "./request";
// let baseUrl = 'https://jdorder.uzosp.com/'; // 正式服务域名接口
let baseUrl = 'https://r.ucaret.cn/test-api'; // 测试服务域名接口
let baseUrl = 'https://movecar.jd.com'; // 测试服务域名接口
//可以new多个request来支持多个域名请求
......@@ -148,7 +148,7 @@ $http.dataFactory = async function(res) {
uni.hideLoading()
if (res.response.statusCode && res.response.statusCode == 200) {
let httpData = res.response.data;
console.log(httpData,"封装请求响应数据55555");
// console.log(httpData,"封装请求响应数据55555");
let currentRoutes = getCurrentPages();
let currentRoute = currentRoutes[currentRoutes.length - 1].route
if (typeof(httpData) == "string") {
......
manifest.json
View file @ f7ea0788
......@@ -59,7 +59,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid" : "wx8fd4dc1c4b9f6f41",
"appid" : "wx237e45bea2220a37",
"setting" : {
"urlCheck" : false,
"minified" : true,
......
pages/home-new.vue
View file @ f7ea0788
......@@ -33,6 +33,14 @@
</view>
</view>
</view>
<view class="banner-other">
<view @click="goShopH5(2)">
<image src="https://nuoche.s3.cn-north-1.jdcloud-oss.com/2022/10/14/eb67b0d88bd24f71a04b6a939ef3bf74.png"></image>
</view>
<view @click="goShopH5(1)">
<image src="https://nuoche.s3.cn-north-1.jdcloud-oss.com/2022/10/14/672f38dadb0f4eacb486af28fe4fe762.png"></image>
</view>
</view>
<u-gap bgColor="transparent" height="20"></u-gap>
</view>
......@@ -90,6 +98,25 @@
};
},
methods: {
goShopH5(index){
let token = uni.getStorageSync('userToken');
if (!token) {
uni.setStorageSync('jdNavto',index)
uni.navigateTo({
url: '/pages/login/index/index'
})
return;
}
let url;
if(index == 1){
url = 'https://pro.m.jd.com/mall/active/3L2hs3R3aibYmosCRzA2Rp5z8pTR/index.html?babelChannel=ttt1'
}else{
url = 'https://jarvis.m.jd.com/start?source=2'
}
// uni.setStorageSync('h5url',url)
util.navigateToH5({page:url})
},
// 跳转 其他小程序页面
goJdShop(index){
let sku;
if(index == 1){
......@@ -266,12 +293,20 @@
let item = this.list5[index]
let link = item.link;
if(link) {
var newStr = link.indexOf("http");
var newStr2 = link.indexOf("https");
if (newStr == 0 || newStr2 == 0) {
uni.navigateTo({
url: '/pages/webview/webview?url=' + link
})
if (item.remark == 'jdh5') {
// uni.navigateTo({
// url: '/pages/webview/webview?url=' + link
// })
let url;
let token = uni.getStorageSync('userToken');
if (!token) {
uni.setStorageSync('jdNavto',1)
uni.navigateTo({
url: '/pages/login/index/index'
})
return;
}
util.navigateToH5({page:link})
return
}
uni.navigateTo({
......@@ -399,6 +434,7 @@
.banner{
width:100%;
margin-top:70rpx;
position: relative;
.banner-img,
.banner-btn{
margin: 0 auto;
......@@ -436,6 +472,25 @@
}
}
}
.banner-other{
position: absolute;
right:-22rpx;top:-80rpx;
z-index:100;
>view{
&:first-child{
margin-left:34rpx;
width: 120rpx;height:112rpx;
}
&:last-child{
margin-top:100rpx;
width: 172rpx;height:140rpx;
}
image{
width:100%;height:100%;
}
}
}
}
......
pages/main.vue
View file @ f7ea0788
......@@ -23,6 +23,7 @@
import moveCar from './moveCar'
import shop from './shop'
import personal from './personal'
import util from '@/pages/login/util.js'
let plugin = requirePlugin('loginPlugin');
export default {
......@@ -58,6 +59,13 @@
};
}
},
onShareTimeline(res){
return {
title: '京东汽车挪车牌',
path: '/pages/main',
imageUrl: ""
};
},
onShow: function() {
uni.hideHomeButton()
if (this.tab == 'personal') {
......@@ -79,6 +87,7 @@
},
methods: {
tabChange(index) {
uni.setStorageSync('tabbar', index)
let that = this
switch (index) {
case 0:
......@@ -343,6 +352,32 @@
// });
// }
// })
} else{
let routerLogin = uni.getStorageSync('routerLogin')
let tabbar = uni.getStorageSync('tabbar')
if(tabbar){
this.tabChange(tabbar)
}
if(routerLogin){
uni.redirectTo({
url:routerLogin
})
}
// 判断是否有京东跳转
let jdNavto = uni.getStorageSync('jdNavto')
if(jdNavto){
let url;
if(jdNavto == 1){
url = 'https://pro.m.jd.com/mall/active/3L2hs3R3aibYmosCRzA2Rp5z8pTR/index.html?babelChannel=ttt1'
}else{
url = 'https://jarvis.m.jd.com/start?source=2'
}
// uni.setStorageSync('h5url',url)
util.navigateToH5({page:url})
uni.removeStorageSync('jdNavto')
}
}
} else {
......
pages/moveCar.vue
View file @ f7ea0788
......@@ -55,6 +55,8 @@
},
methods: {
goUrl(vo) {
uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin',vo.url)
let token = uni.getStorageSync('userToken');
if (!token) {
// uni.navigateTo({
......
pages/personal.vue
View file @ f7ea0788
......@@ -146,6 +146,7 @@ export default {
},
goOrder(current) {
let token = uni.getStorageSync('userToken');
uni.removeStorageSync('routerLogin')
if(!token){
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
......@@ -163,6 +164,8 @@ export default {
},
goUrl(vo) {
let token = uni.getStorageSync('userToken');
uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin', vo.url)
if(!token){
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
......@@ -198,6 +201,8 @@ export default {
},
editInfo() {
let token = uni.getStorageSync('userToken');
uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin', '/pagesD/pages/personal/userInfo')
if(!token){
// uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=4'
......@@ -217,16 +222,25 @@ export default {
this.logoutFlag = false
return
}
await this.$http.request({
url:'/app/user/info',
method:'get',
data:{},
}).then(res => {
this.userInfo = res || {}
if(this.userInfo.avatar){
this.avatar = this.userInfo.avatar
}
})
this.logoutFlag = true
let opts = {
url: '/app/user/info',
method: 'get'
};
await this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
this.userInfo = res.data.data
if (this.userInfo.avatar) {
this.avatar = this.userInfo.avatar
}
} else {
uni.showToast({
title: res.data.msg,
icon: 'none',
duration: 2000
});
}
})
},
openMsg() {
var that = this;
......
pages/shop.vue
View file @ f7ea0788
......@@ -19,7 +19,7 @@
<image :src="getImage(vo.mainImgUrl)" />
</view>
<view class="item2__title">{{vo.title}}</view>
<view class="item2__price">￥{{vo.currentPrice/100}}</view>
<view class="item2__price">￥{{vo.currentPrice/100}}<text style="font-size: 22rpx;">起</text></view>
</view>
</view>
</view>
......@@ -34,7 +34,7 @@
{{vo.title}}
</view>
<view class="one_item_price">
￥{{vo.currentPrice/100}}
￥{{vo.currentPrice/100}}<text style="font-size: 22rpx;margin-right:4rpx;">起</text>
<span class="num__two">￥{{vo.originalPrice/100}}</span>
</view>
</view>
......@@ -49,6 +49,7 @@
</template>
<script>
import util from '@/pages/login/util.js'
export default {
props:["page"],
data() {
......@@ -63,11 +64,7 @@ export default {
auto: true
},
keyword: '',
list3: [
'https://cdn.uviewui.com/uview/swiper/swiper3.png',
'https://cdn.uviewui.com/uview/swiper/swiper2.png',
'https://cdn.uviewui.com/uview/swiper/swiper1.png',
],
list3: [],
//普通商品列表
mallList: [],
//精品商品
......@@ -103,6 +100,8 @@ export default {
},
goDetail(id,link) {
let token = uni.getStorageSync('userToken');
uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin',false)
if(!token){
let returnPage= '/pages/main';
let pageType = "reLaunch"
......@@ -194,12 +193,19 @@ export default {
let item = this.list3[index]
let link = item.link;
if(link) {
var newStr = link.indexOf("http");
var newStr2 = link.indexOf("https");
if (newStr == 0 || newStr2 == 0) {
uni.navigateTo({
url: '/pages/webview/webview?url=' + link
})
if (item.remark == 'jdh5') {
// uni.navigateTo({
// url: '/pages/webview/webview?url=' + link
// })
let token = uni.getStorageSync('userToken');
if (!token) {
uni.setStorageSync('jdNavto',1)
uni.navigateTo({
url: '/pages/login/index/index'
})
return;
}
util.navigateToH5({page:link})
return
}
uni.navigateTo({
......
pagesB/pages/move-car/oneMoveCar.vue
View file @ f7ea0788
......@@ -32,7 +32,7 @@
<div class="move-car__tips">
点击下方按钮联系车主
</div>
<button class="move-car__btn" type='primary'
open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
拨打车主电话通知
......@@ -341,7 +341,7 @@
longitude +
',' +
latitude +
'&key=1bba2ab2de600f8b5fafe167e09cd2af&radius=1000&extensions=all',
'&key=88cc9f2b486f21e85ef827131b3dd165&radius=1000&extensions=all',
success(res) {
console.log(res);
if (res.statusCode === 200) {
......@@ -556,7 +556,7 @@
}
}
.move-car__more {
font-size: 28rpx;
......
pagesD/pages/personal/addAddress.vue
View file @ f7ea0788
......@@ -200,7 +200,7 @@
longitude +
',' +
latitude +
'&key=1bba2ab2de600f8b5fafe167e09cd2af&radius=1000&extensions=all',
'&key=88cc9f2b486f21e85ef827131b3dd165&radius=1000&extensions=all',
success(res) {
//console.log(res);
if (res.statusCode === 200) {
......
pagesD/pages/personal/editAddress.vue
View file @ f7ea0788
......@@ -224,7 +224,7 @@ export default {
longitude +
',' +
latitude +
'&key=1bba2ab2de600f8b5fafe167e09cd2af&radius=1000&extensions=all',
'&key=88cc9f2b486f21e85ef827131b3dd165&radius=1000&extensions=all',
success(res) {
//console.log(res);
if (res.statusCode === 200) {
......
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