Commit c02a5a0c authored by 肖健's avatar 肖健

token存储key更改

parent 90fea996
...@@ -34,7 +34,7 @@ const httpRequest = (opts, data) => { ...@@ -34,7 +34,7 @@ const httpRequest = (opts, data) => {
let requestNumber = 0; let requestNumber = 0;
//带Token请求 //带Token请求
const httpTokenRequest = (opts, data) => { const httpTokenRequest = (opts, data) => {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
uni.getStorage({ uni.getStorage({
key: 'token', key: 'token',
success: function(ress) { success: function(ress) {
...@@ -67,10 +67,10 @@ const httpTokenRequest = (opts, data) => { ...@@ -67,10 +67,10 @@ const httpTokenRequest = (opts, data) => {
if(res[1].data.code == 401){ if(res[1].data.code == 401){
if(requestNumber <= 0){ if(requestNumber <= 0){
requestNumber ++ requestNumber ++
uni.removeStorageSync('userToken') uni.removeStorageSync('userToken1')
let returnPage= '/pages/main'; let returnPage= '/pages/main';
let pageType = "reLaunch" let pageType = "reLaunch"
this.$jdLoginPage(returnPage, pageType, () => { this.$jdLoginPage(returnPage, pageType, () => {
requestNumber = 0 requestNumber = 0
}) })
...@@ -97,4 +97,4 @@ export default { ...@@ -97,4 +97,4 @@ export default {
baseUrl, baseUrl,
httpRequest, httpRequest,
httpTokenRequest httpTokenRequest
} }
\ No newline at end of file
...@@ -128,8 +128,8 @@ export default class request { ...@@ -128,8 +128,8 @@ export default class request {
}) })
setTimeout(() => { setTimeout(() => {
if(loginPopupNum <= 0){ if(loginPopupNum <= 0){
loginPopupNum ++ loginPopupNum ++
uni.removeStorageSync('userToken') uni.removeStorageSync('userToken1')
let returnPage= '/pages/main'; let returnPage= '/pages/main';
let pageType = "reLaunch" let pageType = "reLaunch"
jdLoginPage(returnPage, pageType) jdLoginPage(returnPage, pageType)
......
...@@ -62,7 +62,7 @@ $http.getAliToken = function(callback) { ...@@ -62,7 +62,7 @@ $http.getAliToken = function(callback) {
*接口返回参数: *接口返回参数:
*visitPrefix: 访问文件的域名 *visitPrefix: 访问文件的域名
*folderPath: 上传的文件夹 *folderPath: 上传的文件夹
*region: 地区 *region: 地区
*bucket: 阿里云的 bucket *bucket: 阿里云的 bucket
*accessKeyId: 阿里云的访问ID *accessKeyId: 阿里云的访问ID
*accessKeySecret: 阿里云的访问密钥 *accessKeySecret: 阿里云的访问密钥
...@@ -123,7 +123,7 @@ $http.requestStart = function(options) { ...@@ -123,7 +123,7 @@ $http.requestStart = function(options) {
} }
} }
//请求前加入token //请求前加入token
options.header['Authorization'] ='Bearer '+ uni.getStorageSync('userToken'); options.header['Authorization'] ='Bearer '+ uni.getStorageSync('userToken1');
return options; return options;
} }
//请求结束 //请求结束
...@@ -183,8 +183,8 @@ $http.dataFactory = async function(res) { ...@@ -183,8 +183,8 @@ $http.dataFactory = async function(res) {
}) })
setTimeout(() => { setTimeout(() => {
if(loginPopupNum <= 0){ if(loginPopupNum <= 0){
loginPopupNum ++ loginPopupNum ++
uni.removeStorageSync('userToken') uni.removeStorageSync('userToken1')
let returnPage= '/pages/main'; let returnPage= '/pages/main';
let pageType = "reLaunch" let pageType = "reLaunch"
jdLoginPage(returnPage, pageType) jdLoginPage(returnPage, pageType)
......
import util from '@/pages/login/util.js' import util from '@/pages/login/util.js'
import ParamsSign from 'js-security-jdxcx'; import ParamsSign from 'js-security-jdxcx';
let loginPlugin = requirePlugin('loginPlugin'); let loginPlugin = requirePlugin('loginPlugin');
export function goToLocation(item) { export function goToLocation(item) {
//小程序内链接 //小程序内链接
...@@ -8,8 +8,8 @@ export function goToLocation(item) { ...@@ -8,8 +8,8 @@ export function goToLocation(item) {
url: item.link url: item.link
}) })
return return
} }
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if (!token) { if (!token) {
uni.setStorageSync('jdNavToObj', item) uni.setStorageSync('jdNavToObj', item)
let returnPage= '/pages/main'; let returnPage= '/pages/main';
...@@ -20,30 +20,30 @@ export function goToLocation(item) { ...@@ -20,30 +20,30 @@ export function goToLocation(item) {
//H5链接,判断链接是否设置 //H5链接,判断链接是否设置
if(item.busType == 1 && item.link){ if(item.busType == 1 && item.link){
util.navigateToH5({page:item.link}) util.navigateToH5({page:item.link})
} }
//小程序链接,需要判断链接和appId是否都设置 //小程序链接,需要判断链接和appId是否都设置
if(item.busType == 2 && item.appId != null && item.link){ if(item.busType == 2 && item.appId != null && item.link){
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({
appId: item.appId, // 跳转目标小程序的id appId: item.appId, // 跳转目标小程序的id
path: item.link, // 目标小程序的页面路径 path: item.link, // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success:(res)=> { success:(res)=> {
// 打开成功 // 打开成功
}, },
fail:()=>{ fail:()=>{
} }
}) })
} }
} }
export function jdLoginPage(returnPage, pageType, successCallback) { export function jdLoginPage(returnPage, pageType, successCallback) {
//设置加固对象 //设置加固对象
loginPlugin.setParamsSign && loginPlugin.setParamsSign(ParamsSign); loginPlugin.setParamsSign && loginPlugin.setParamsSign(ParamsSign);
var url = '/pages/login/index/index?returnPage=' + (returnPage ? returnPage : '') + "&pageType=" + (pageType ? pageType: ''); var url = '/pages/login/index/index?returnPage=' + (returnPage ? returnPage : '') + "&pageType=" + (pageType ? pageType: '');
...@@ -56,4 +56,4 @@ export function jdLoginPage(returnPage, pageType, successCallback) { ...@@ -56,4 +56,4 @@ export function jdLoginPage(returnPage, pageType, successCallback) {
} }
} }
}) })
} }
\ No newline at end of file
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
// duration: 1500 // duration: 1500
// }) // })
// uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath); // uni.setStorageSync('xcxIndexPath', res.data.data.xcxIndexPath);
// uni.setStorageSync("userToken", res.data.data.token) // uni.setStorageSync("userToken1", res.data.data.token)
// //
// if (this.scene) { // if (this.scene) {
// let param = { // let param = {
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,8 @@
// } // }
// //
// //
// let userToken = uni.getStorageSync('userToken') // let userToken1 = uni.getStorageSync('userToken1')
// if (userToken) { // if (userToken1) {
// let that = this // let that = this
// let opts = { // let opts = {
// url: '/app/user/info', // url: '/app/user/info',
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</u-swiper> </u-swiper>
</view> </view>
</view> </view>
<view class="banner"> <view class="banner">
<view :class="indexCommodityList.length == 1 ? 'banner-bg' : 'banner-bg banner-bg-1'" v-if="indexCommodityList && indexCommodityList.length == 1"> <view :class="indexCommodityList.length == 1 ? 'banner-bg' : 'banner-bg banner-bg-1'" v-if="indexCommodityList && indexCommodityList.length == 1">
<image src="http://jdnc-oss.uzosp.com/2022/12/28/b1679b5da1b84fa1827039fe4fadd91c.png"></image> <image src="http://jdnc-oss.uzosp.com/2022/12/28/b1679b5da1b84fa1827039fe4fadd91c.png"></image>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
</swiper> </swiper>
</view> </view>
</view> </view>
<view class="banner-other" v-if="levitationList && levitationList.length > 0"> <view class="banner-other" v-if="levitationList && levitationList.length > 0">
<view v-for="(item, i) in levitationList" :key="i" @click="$goToLocation(item)"> <view v-for="(item, i) in levitationList" :key="i" @click="$goToLocation(item)">
<view v-if="i !== 0" style="margin-top: 50rpx;"> <view v-if="i !== 0" style="margin-top: 50rpx;">
...@@ -61,15 +61,15 @@ ...@@ -61,15 +61,15 @@
<view v-else> <view v-else>
<u--image :src="item.imageUrl" width="160rpx" height="120rpx"></u--image> <u--image :src="item.imageUrl" width="160rpx" height="120rpx"></u--image>
</view> </view>
</view> </view>
</view> </view>
<u-gap bgColor="transparent" height="20"></u-gap> <u-gap bgColor="transparent" height="20"></u-gap>
</view> </view>
</view> </view>
<!-- bg-img2为视频播放 --> <!-- bg-img2为视频播放 -->
<view class="bg-img2" v-if="videoObj"> <view class="bg-img2" v-if="videoObj">
<image src="http://jdnc-oss.uzosp.com/2022/12/27/6a1ef562576f4e86a98118c9e343b9da.png"></image> <image src="http://jdnc-oss.uzosp.com/2022/12/27/6a1ef562576f4e86a98118c9e343b9da.png"></image>
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
<view class="bg-img" v-else> <view class="bg-img" v-else>
<image src="http://jdnc-oss.uzosp.com/2022/06/15/079440f5eea541bba67ea3d5f8097162.png"></image> <image src="http://jdnc-oss.uzosp.com/2022/06/15/079440f5eea541bba67ea3d5f8097162.png"></image>
</view> </view>
<!-- 已领取优惠券后弹框 --> <!-- 已领取优惠券后弹框 -->
<view class="pooup-get-coupon" v-if="pooupCoupon"> <view class="pooup-get-coupon" v-if="pooupCoupon">
<view class="coupon-box"> <view class="coupon-box">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<view class=""> <view class="">
正在跳转中......({{timerNum}}秒) 正在跳转中......({{timerNum}}秒)
</view> </view>
</view> </view>
<view class="coupon-btn" @click="goBuy"> <view class="coupon-btn" @click="goBuy">
去原价购买 去原价购买
</view> </view>
...@@ -141,14 +141,14 @@ ...@@ -141,14 +141,14 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: d.link, // 目标小程序的页面路径 path: d.link, // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success:(res)=> { success:(res)=> {
// 打开成功 // 打开成功
}, },
fail:()=>{ fail:()=>{
} }
}) })
}, },
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
}) })
this.clickState = true this.clickState = true
let that = this let that = this
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if (!token) { if (!token) {
uni.hideLoading() uni.hideLoading()
this.clickState = false this.clickState = false
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
// }) // })
return; return;
} }
let opts = { let opts = {
url: '/app/user/info', url: '/app/user/info',
method: 'get' method: 'get'
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
// icon: 'none', // icon: 'none',
// duration: 2000, // duration: 2000,
// success:function(){ // success:function(){
// } // }
// }); // });
this.pooupCoupon = true this.pooupCoupon = true
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径 path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success(res) { success(res) {
// 打开成功 // 打开成功
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径 path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success:(res)=> { success:(res)=> {
// 打开成功 // 打开成功
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
url:'/app/index/video/1', url:'/app/index/video/1',
method:'get', method:'get',
data:{ data:{
}, },
}).then(res => { }).then(res => {
if(res && res.length > 0) { if(res && res.length > 0) {
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
url:'/app/index/levitation/1', url:'/app/index/levitation/1',
method:'get', method:'get',
data:{ data:{
}, },
}).then(res => { }).then(res => {
if(res && res.length > 0) { if(res && res.length > 0) {
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
url:'/app/index/mall/index', url:'/app/index/mall/index',
method:'get', method:'get',
data:{ data:{
}, },
}).then(res => { }).then(res => {
if(res && res.length > 0) { if(res && res.length > 0) {
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
} }
}) })
}, },
// 轮播跳转其他页面 // 轮播跳转其他页面
goOtherLink(index) { goOtherLink(index) {
let item = this.list5[index] let item = this.list5[index]
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: '京东汽车挪车牌' title: '京东汽车挪车牌'
}); });
// 获取 video 上下文 videoContext 对象 // 获取 video 上下文 videoContext 对象
this.videoContext = uni.createVideoContext('myvideo') this.videoContext = uni.createVideoContext('myvideo')
// 进入全屏状态 // 进入全屏状态
...@@ -483,7 +483,7 @@ ...@@ -483,7 +483,7 @@
font-size: 24rpx; font-size: 24rpx;
} }
} }
.banner{ .banner{
width:100%; width:100%;
margin-top:70rpx; margin-top:70rpx;
...@@ -527,22 +527,22 @@ ...@@ -527,22 +527,22 @@
.banner-bg-1 { .banner-bg-1 {
justify-content: center; justify-content: center;
} }
.banner-other{ .banner-other{
position: absolute; position: absolute;
right:-22rpx;top:-80rpx; right:-22rpx;top:-80rpx;
// z-index:100; // z-index:100;
} }
} }
.bg-img{ .bg-img{
width:750rpx; width:750rpx;
image{ image{
width:750rpx;height:4420rpx; width:750rpx;height:4420rpx;
} }
} }
.bg-img2{ .bg-img2{
width:750rpx; width:750rpx;
position: relative; position: relative;
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
height: 310rpx; height: 310rpx;
} }
} }
// 弹框 // 弹框
.pooup-get-coupon{ .pooup-get-coupon{
position: fixed; position: fixed;
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<image src="@/static/index/index8.png"></image> <image src="@/static/index/index8.png"></image>
</div> </div>
<u-gap bgColor="transparent" height="60"></u-gap> <u-gap bgColor="transparent" height="60"></u-gap>
<!-- 已领取优惠券后弹框 --> <!-- 已领取优惠券后弹框 -->
<view class="pooup-get-coupon" v-if="pooupCoupon"> <view class="pooup-get-coupon" v-if="pooupCoupon">
<view class="coupon-box"> <view class="coupon-box">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<view class=""> <view class="">
正在跳转中......({{timerNum}}秒) 正在跳转中......({{timerNum}}秒)
</view> </view>
</view> </view>
<view class="coupon-btn" @click="goBuy"> <view class="coupon-btn" @click="goBuy">
去原价购买 去原价购买
</view> </view>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
}) })
this.clickState = true this.clickState = true
let that = this let that = this
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if (!token) { if (!token) {
uni.hideLoading() uni.hideLoading()
this.clickState = false this.clickState = false
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
// }) // })
return; return;
} }
let opts = { let opts = {
url: '/app/user/info', url: '/app/user/info',
method: 'get' method: 'get'
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
// icon: 'none', // icon: 'none',
// duration: 2000, // duration: 2000,
// success:function(){ // success:function(){
// } // }
// }); // });
this.pooupCoupon = true this.pooupCoupon = true
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径 path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success(res) { success(res) {
// 打开成功 // 打开成功
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径 path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success:(res)=> { success:(res)=> {
// 打开成功 // 打开成功
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
font-size: 24rpx; font-size: 24rpx;
} }
} }
.pooup-get-coupon{ .pooup-get-coupon{
position: fixed; position: fixed;
top:0;right:0; top:0;right:0;
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
onShareTimeline(res){ onShareTimeline(res){
return { return {
title: '京东汽车挪车牌', title: '京东汽车挪车牌',
path: '/pages/main', path: '/pages/main',
imageUrl: "" imageUrl: ""
}; };
}, },
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
this.tab = 'moveCar' this.tab = 'moveCar'
break; break;
case 2: case 2:
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if (token) { if (token) {
if (this.scanClick) { if (this.scanClick) {
this.scanClick = false this.scanClick = false
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
this.scanClick = true this.scanClick = true
if(res.errMsg === 'scanCode:ok') { if(res.errMsg === 'scanCode:ok') {
let scanType = res.scanType let scanType = res.scanType
let path = '' let path = ''
//扫的小程序码 //扫的小程序码
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
if(scanType === 'QR_CODE') { if(scanType === 'QR_CODE') {
path = res.result path = res.result
} }
if (path) { if (path) {
let paths = path.split('?')[1] let paths = path.split('?')[1]
let scene = paths.split("=")[1] let scene = paths.split("=")[1]
...@@ -150,19 +150,19 @@ ...@@ -150,19 +150,19 @@
break; break;
case 3: case 3:
// this.tab = 'shop' // this.tab = 'shop'
uni.navigateToMiniProgram({ uni.navigateToMiniProgram({
appId: 'wx1bfd5dd137c5ef13', // 跳转目标小程序的id appId: 'wx1bfd5dd137c5ef13', // 跳转目标小程序的id
// path: item.link, // 目标小程序的页面路径 // path: item.link, // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success:(res)=> { success:(res)=> {
// 打开成功 // 打开成功
}, },
fail:()=>{ fail:()=>{
} }
}) })
break; break;
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径 path: 'pages/item/detail/detail?sku=100023585323', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success: (res) => { success: (res) => {
// 打开成功 // 打开成功
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
//清空二维码的q参数值 //清空二维码的q参数值
option.q = null option.q = null
} }
// 静默授权获取openid // 静默授权获取openid
let openid = uni.getStorageSync('openid'); let openid = uni.getStorageSync('openid');
if (!openid) { if (!openid) {
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
} }
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if (!token) { if (!token) {
let ptKey = plugin.getPtKey(); let ptKey = plugin.getPtKey();
if (ptKey) { if (ptKey) {
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
let returnPage= '/pages/main' let returnPage= '/pages/main'
let pageType = "reLaunch" let pageType = "reLaunch"
that.$jdLoginPage(returnPage, pageType) that.$jdLoginPage(returnPage, pageType)
// uni.showToast({ // uni.showToast({
// title: `京东登录失败:${message}`, // title: `京东登录失败:${message}`,
// icon: 'none', // icon: 'none',
...@@ -351,14 +351,14 @@ ...@@ -351,14 +351,14 @@
console.log(res,'88888888') console.log(res,'88888888')
if (res.data.code == 200) { if (res.data.code == 200) {
let token = res.data.data.token let token = res.data.data.token
uni.setStorageSync('userToken', token) uni.setStorageSync('userToken1', token)
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: "登录成功", title: "登录成功",
icon: 'none', icon: 'none',
duration: 2000 duration: 2000
}); });
// 判断是否扫码进入 // 判断是否扫码进入
that.scene = uni.getStorageSync('scene') that.scene = uni.getStorageSync('scene')
console.log(that.scene, "微信扫码进入") console.log(that.scene, "微信扫码进入")
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
if(routerLogin){ if(routerLogin){
uni.setStorageSync('routerLogin', false) uni.setStorageSync('routerLogin', false)
let routerLoginPageType = uni.getStorageSync('routerLoginPageType') let routerLoginPageType = uni.getStorageSync('routerLoginPageType')
if(routerLoginPageType == 'switchTab') { if(routerLoginPageType == 'switchTab') {
uni.navigateTo({ uni.navigateTo({
url: routerLogin url: routerLogin
}) })
...@@ -385,17 +385,17 @@ ...@@ -385,17 +385,17 @@
}) })
} }
uni.removeStorageSync('routerLoginPageType') uni.removeStorageSync('routerLoginPageType')
} }
// 判断是否有京东跳转 // 判断是否有京东跳转
let jdNavToObj = uni.getStorageSync('jdNavToObj') let jdNavToObj = uni.getStorageSync('jdNavToObj')
if(jdNavToObj){ if(jdNavToObj){
uni.removeStorageSync('jdNavToObj') uni.removeStorageSync('jdNavToObj')
this.$goToLocation(jdNavToObj) this.$goToLocation(jdNavToObj)
} }
} }
} else { } else {
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
......
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="carouselFlag" style="width: 700rpx;margin: 0 auto;position: relative;"> <view v-if="carouselFlag" style="width: 700rpx;margin: 0 auto;position: relative;">
<u-swiper radius="12rpx" :height="120" :list="list5" circular @change="e => current = e.current" <u-swiper radius="12rpx" :height="120" :list="list5" circular @change="e => current = e.current"
:autoplay="true" keyName="imageUrl" @click="goOtherLink"> :autoplay="true" keyName="imageUrl" @click="goOtherLink">
</u-swiper> </u-swiper>
<view style="position: absolute;right: 10rpx; top:10rpx;z-index: 99999;"> <view style="position: absolute;right: 10rpx; top:10rpx;z-index: 99999;">
<u--image src="/static/my/close.png" width="12px" height="12px" @click="closeCarouselFlag"></u--image> <u--image src="/static/my/close.png" width="12px" height="12px" @click="closeCarouselFlag"></u--image>
</view> </view>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
goUrl(vo) { goUrl(vo) {
uni.removeStorageSync('routerLogin') uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin',vo.url) uni.setStorageSync('routerLogin',vo.url)
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if (!token) { if (!token) {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/binding/index?url=/pages/main&index=1' // url: '/pages/binding/index?url=/pages/main&index=1'
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
icon: 'error', icon: 'error',
}) })
} }
}, },
fail: () => { fail: () => {
this.scanClick = true this.scanClick = true
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
setTimeout(() => { setTimeout(() => {
this.show = true this.show = true
}, 100); }, 100);
this.getRotationList() this.getRotationList()
}, },
}; };
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<u-swiper radius="12rpx" :height="120" :list="list5" circular @change="e => current = e.current" <u-swiper radius="12rpx" :height="120" :list="list5" circular @change="e => current = e.current"
:autoplay="true" keyName="imageUrl" @click="goOtherLink"> :autoplay="true" keyName="imageUrl" @click="goOtherLink">
</u-swiper> </u-swiper>
<view style="position: absolute;right: 10rpx; top:10rpx;z-index: 99999;"> <view style="position: absolute;right: 10rpx; top:10rpx;z-index: 99999;">
<u--image src="/static/my/close.png" width="12px" height="12px" @click="closeCarouselFlag"></u--image> <u--image src="/static/my/close.png" width="12px" height="12px" @click="closeCarouselFlag"></u--image>
</view> </view>
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
data:{}, data:{},
}).then(res => { }).then(res => {
this.token = null this.token = null
uni.removeStorageSync('userToken') uni.removeStorageSync('userToken1')
uni.removeStorageSync('xcxIndexPath') uni.removeStorageSync('xcxIndexPath')
// uni.removeStorageSync('openid') // uni.removeStorageSync('openid')
plugin.logout().then((res) => { plugin.logout().then((res) => {
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
}) })
}, },
goOrder(current) { goOrder(current) {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
uni.removeStorageSync('routerLogin') uni.removeStorageSync('routerLogin')
if(!token){ if(!token){
// uni.navigateTo({ // uni.navigateTo({
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
}); });
}, },
goUrl(vo) { goUrl(vo) {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
uni.removeStorageSync('routerLogin') uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin', vo.url) uni.setStorageSync('routerLogin', vo.url)
if(!token){ if(!token){
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id appId: 'wx91d27dbf599dff74', // 跳转目标小程序的id
path: '', // 目标小程序的页面路径 path: '', // 目标小程序的页面路径
extraData: { // 需要携带的参数 extraData: { // 需要携带的参数
}, },
success(res) { success(res) {
// 打开成功 // 打开成功
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
}, },
editInfo() { editInfo() {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
uni.removeStorageSync('routerLogin') uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin', '/pagesD/pages/personal/userInfo') uni.setStorageSync('routerLogin', '/pagesD/pages/personal/userInfo')
if(!token){ if(!token){
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
}); });
}, },
async getUserInfo() { async getUserInfo() {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if(!token){ if(!token){
this.logoutFlag = false this.logoutFlag = false
return return
...@@ -376,31 +376,31 @@ ...@@ -376,31 +376,31 @@
setTimeout(() => { setTimeout(() => {
this.show=true this.show=true
}, 100); }, 100);
this.token = uni.getStorageSync('userToken'); this.token = uni.getStorageSync('userToken1');
if(this.token){ if(this.token){
this.getUserInfo() this.getUserInfo()
} }
this.getRotationList() this.getRotationList()
let that = this let that = this
uni.getSystemInfo({ uni.getSystemInfo({
success: (res) => { success: (res) => {
// 注意这里获得的高度宽度都是px,需要转换rpx // 注意这里获得的高度宽度都是px,需要转换rpx
// 可使用窗口高度,不包含导航栏 // 可使用窗口高度,不包含导航栏
let windowHeight = res.windowHeight let windowHeight = res.windowHeight
// 可使用窗口宽度 // 可使用窗口宽度
let windowWidth = res.windowWidth let windowWidth = res.windowWidth
let query = uni.createSelectorQuery().in(that); let query = uni.createSelectorQuery().in(that);
setTimeout(() => { setTimeout(() => {
query.select(".personal").boundingClientRect(function(data) { //data - 各种参数 query.select(".personal").boundingClientRect(function(data) { //data - 各种参数
// 获取元素高度 // 获取元素高度
let personalHeight = data.height let personalHeight = data.height
uni.createSelectorQuery().in(that.$parent.$refs.myTab).select(".weui-tabbar").boundingClientRect(function(data) { //data - 各种参数 uni.createSelectorQuery().in(that.$parent.$refs.myTab).select(".weui-tabbar").boundingClientRect(function(data) { //data - 各种参数
// 获取元素高度 // 获取元素高度
let tabbarHeight = data.height let tabbarHeight = data.height
let remainder = windowHeight - personalHeight - tabbarHeight let remainder = windowHeight - personalHeight - tabbarHeight
if(remainder > 130) { if(remainder > 130) {
//可使用窗口高度,将px转换rpx //可使用窗口高度,将px转换rpx
...@@ -408,9 +408,9 @@ ...@@ -408,9 +408,9 @@
} }
}).exec() }).exec()
}).exec() }).exec()
}, 100); }, 100);
} }
}) })
}, },
...@@ -435,9 +435,9 @@ ...@@ -435,9 +435,9 @@
margin-bottom: 30px; margin-bottom: 30px;
// margin: 20rpx 30rpx auto auto; // margin: 20rpx 30rpx auto auto;
} }
.personal { .personal {
.ps__bg { .ps__bg {
background: url('@/static/my/my-bg.png') no-repeat; background: url('@/static/my/my-bg.png') no-repeat;
background-size: cover; background-size: cover;
...@@ -645,7 +645,7 @@ ...@@ -645,7 +645,7 @@
// } // }
// } // }
// } // }
// .list__item:last-child { // .list__item:last-child {
// .list__left { // .list__left {
// image { // image {
......
...@@ -99,7 +99,7 @@ export default { ...@@ -99,7 +99,7 @@ export default {
}) })
}, },
goDetail(id,link) { goDetail(id,link) {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
uni.removeStorageSync('routerLogin') uni.removeStorageSync('routerLogin')
uni.setStorageSync('routerLogin',false) uni.setStorageSync('routerLogin',false)
if(!token){ if(!token){
...@@ -224,27 +224,27 @@ export default { ...@@ -224,27 +224,27 @@ export default {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
.one_item { .one_item {
width: 48%; width: 48%;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2); box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.2);
border-radius: 20rpx; border-radius: 20rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.one_item_img { .one_item_img {
width: 100%; width: 100%;
height: 320rpx; height: 320rpx;
background: #FFD4D4; background: #FFD4D4;
border-radius: 20rpx; border-radius: 20rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 20rpx; border-radius: 20rpx;
} }
} }
.one_item_title { .one_item_title {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -257,7 +257,7 @@ export default { ...@@ -257,7 +257,7 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.one_item_price { .one_item_price {
font-size: 26rpx; font-size: 26rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
color: #E1251B; color: #E1251B;
text-indent: 20rpx; text-indent: 20rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
span { span {
font-size: 20rpx; font-size: 20rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -277,8 +277,8 @@ export default { ...@@ -277,8 +277,8 @@ export default {
} }
} }
.my__search { .my__search {
padding: 30rpx; padding: 30rpx;
} }
......
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
<view> <view>
<view> <view>
{{carInfo.brand + "-" + carInfo.seriesName}} {{carInfo.brand + "-" + carInfo.seriesName}}
</view> </view>
{{carInfo.carModel}} {{carInfo.carModel}}
</view> </view>
<view class="gt"> <view class="gt">
<u-icon name="arrow-right" color="#fff"></u-icon> <u-icon name="arrow-right" color="#fff"></u-icon>
</view> </view>
</view> </view>
<view class="right" style="width:400rpx;" v-else @click="getCarList"> <view class="right" style="width:400rpx;" v-else @click="getCarList">
<u--text suffixIcon="arrow-right" align="right" size="28rpx" color="#fff" iconStyle="font-size: 28rpx;color:#fff;" text="请选择"></u--text> <u--text suffixIcon="arrow-right" align="right" size="28rpx" color="#fff" iconStyle="font-size: 28rpx;color:#fff;" text="请选择"></u--text>
</view> </view>
...@@ -74,9 +74,9 @@ ...@@ -74,9 +74,9 @@
</view> </view>
</view> </view>
<u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true" @end="disabled1 = false"></u-code> <u-code ref="uCode" @change="codeChange" seconds="60" @start="disabled1 = true" @end="disabled1 = false"></u-code>
<address-picker :show="addressShow" @confirm="addressConfirm" @cancel="addressCancel"></address-picker> <address-picker :show="addressShow" @confirm="addressConfirm" @cancel="addressCancel"></address-picker>
<!-- 爱车选择弹框 --> <!-- 爱车选择弹框 -->
<u-popup :show="selectCar" mode="bottom" round="10" @close="selectCar = false"> <u-popup :show="selectCar" mode="bottom" round="10" @close="selectCar = false">
<view class="love_car_list"> <view class="love_car_list">
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin: 0 auto; width: 706rpx;"> <view style="margin: 0 auto; width: 706rpx;">
<image style="width: 706rpx;height: 527rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/550c77228abf46e49d9588568e14e57a.png"></image> <image style="width: 706rpx;height: 527rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/550c77228abf46e49d9588568e14e57a.png"></image>
</view> </view>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<view style="margin: 59rpx auto 0 auto; width: 708rpx;padding-bottom: 87rpx;"> <view style="margin: 59rpx auto 0 auto; width: 708rpx;padding-bottom: 87rpx;">
<image style="width: 708rpx;height: 1429rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/f4c2093310604cf983b50b87f9ca99a4.png"></image> <image style="width: 708rpx;height: 1429rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/f4c2093310604cf983b50b87f9ca99a4.png"></image>
</view> </view>
<!-- 爱车选择弹框 --> <!-- 爱车选择弹框 -->
<u-popup :show="inputCodeShow" mode="bottom" round="10" @close="inputCodeShow = false"> <u-popup :show="inputCodeShow" mode="bottom" round="10" @close="inputCodeShow = false">
<view class="love_car_list"> <view class="love_car_list">
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<view style="width: 600rpx; margin: 30rpx auto 0 auto;"> <view style="width: 600rpx; margin: 30rpx auto 0 auto;">
<u-button color="#1c81e8" text="确认" customStyle="width: 400rpx" @click="submitVerifyCode"></u-button> <u-button color="#1c81e8" text="确认" customStyle="width: 400rpx" @click="submitVerifyCode"></u-button>
</view> </view>
</view> </view>
</u-popup> </u-popup>
<!-- 领取成功 --> <!-- 领取成功 -->
...@@ -195,14 +195,14 @@ export default { ...@@ -195,14 +195,14 @@ export default {
receivedFailShow:false, receivedFailShow:false,
receiveSuccessShow:false, receiveSuccessShow:false,
inputCodeShow:false, inputCodeShow:false,
addressShow:false, addressShow:false,
//获取短信验证码相关 begin //获取短信验证码相关 begin
disabled1: false, disabled1: false,
tips : '', tips : '',
//获取短信验证码相关 end //获取短信验证码相关 end
//选择车辆相关 begin //选择车辆相关 begin
selectCar:false, selectCar:false,
radioValue:"", radioValue:"",
...@@ -211,9 +211,9 @@ export default { ...@@ -211,9 +211,9 @@ export default {
carList:[], carList:[],
carInfo: null, carInfo: null,
//选择车辆相关 end //选择车辆相关 end
disabledSubmit:true, disabledSubmit:true,
//是否已经领取过 //是否已经领取过
already: true, already: true,
//已经领取的错误提示文案 //已经领取的错误提示文案
...@@ -221,12 +221,12 @@ export default { ...@@ -221,12 +221,12 @@ export default {
//是否要显示图形验证码 //是否要显示图形验证码
captcha : false, captcha : false,
captchaImg : '', captchaImg : '',
verifyInfo: { verifyInfo: {
vc:'', vc:'',
vi: '', vi: '',
}, },
actInfo: { actInfo: {
carId:'', carId:'',
userName: '', userName: '',
...@@ -327,8 +327,8 @@ export default { ...@@ -327,8 +327,8 @@ export default {
this.tips = text; this.tips = text;
}, },
checkLogin() { checkLogin() {
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(!token) { if(!token) {
uni.setStorageSync('routerLogin', '/pagesA/pages/mrAct/index') uni.setStorageSync('routerLogin', '/pagesA/pages/mrAct/index')
uni.setStorageSync('routerLoginPageType', 'switchTab') uni.setStorageSync('routerLoginPageType', 'switchTab')
//跳转到登录页 //跳转到登录页
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
if(that.disabledSubmit) { if(that.disabledSubmit) {
return return
} }
if(!that.actInfo.telNumber) { if(!that.actInfo.telNumber) {
uni.$u.toast('请填写收货电话') uni.$u.toast('请填写收货电话')
return return
...@@ -375,12 +375,12 @@ export default { ...@@ -375,12 +375,12 @@ export default {
uni.hideLoading(); uni.hideLoading();
let code = res.data.code let code = res.data.code
if (code == 200) { if (code == 200) {
// 这里此提示会被this.start()方法中的提示覆盖 // 这里此提示会被this.start()方法中的提示覆盖
uni.$u.toast('别着急!短信已经发送了~'); uni.$u.toast('别着急!短信已经发送了~');
// 通知验证码组件内部开始倒计时 // 通知验证码组件内部开始倒计时
that.$refs.uCode.start(); that.$refs.uCode.start();
this.inputCodeShow = false this.inputCodeShow = false
} else if (code == 1000000004) { } else if (code == 1000000004) {
that.getCaptchaImage() that.getCaptchaImage()
...@@ -465,12 +465,12 @@ export default { ...@@ -465,12 +465,12 @@ export default {
if(that.captcha) { if(that.captcha) {
that.getCaptchaImage() that.getCaptchaImage()
if(show) { if(show) {
this.inputCodeShow = true this.inputCodeShow = true
} }
} else { } else {
that.sendSmsCode() that.sendSmsCode()
} }
}) })
}, },
submitVerifyCode() { submitVerifyCode() {
...@@ -487,15 +487,15 @@ export default { ...@@ -487,15 +487,15 @@ export default {
submitAct() { submitAct() {
let that = this let that = this
that.checkLogin() that.checkLogin()
if(that.disabledSubmit) { if(that.disabledSubmit) {
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(token) { if(token) {
that.receivedFailShow = true that.receivedFailShow = true
} }
return return
} }
that.$refs.form1.validate().then(res => { that.$refs.form1.validate().then(res => {
let data = JSON.parse(JSON.stringify(that.actInfo)) let data = JSON.parse(JSON.stringify(that.actInfo))
let address = data.address.split('/') let address = data.address.split('/')
...@@ -503,7 +503,7 @@ export default { ...@@ -503,7 +503,7 @@ export default {
data.province = address[0] data.province = address[0]
data.city = address[1] data.city = address[1]
data.district = address[2] data.district = address[2]
let opts = { let opts = {
url: '/app/move/activity', url: '/app/move/activity',
method: 'post' method: 'post'
...@@ -511,10 +511,10 @@ export default { ...@@ -511,10 +511,10 @@ export default {
that.http.httpTokenRequest(opts, data).then(res => { that.http.httpTokenRequest(opts, data).then(res => {
let code = res.data.code let code = res.data.code
if (code == 200) { if (code == 200) {
//清空短信验证码倒计时 //清空短信验证码倒计时
that.$refs.uCode.reset(); that.$refs.uCode.reset();
that.receiveSuccessShow = true that.receiveSuccessShow = true
that.getActCheckInfo() that.getActCheckInfo()
} else if (code == 1000000003) { } else if (code == 1000000003) {
...@@ -535,9 +535,9 @@ export default { ...@@ -535,9 +535,9 @@ export default {
uni.$u.toast(errors[0].message) uni.$u.toast(errors[0].message)
} }
}) })
}, },
}, },
onReady() { onReady() {
this.$refs.form1.setRules(this.rules) this.$refs.form1.setRules(this.rules)
...@@ -561,10 +561,10 @@ export default { ...@@ -561,10 +561,10 @@ export default {
title: this.appName, title: this.appName,
}); });
let that = this let that = this
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(token) { if(token) {
that.getActCheckInfo() that.getActCheckInfo()
} }
}, },
} }
</script> </script>
...@@ -653,7 +653,7 @@ export default { ...@@ -653,7 +653,7 @@ export default {
} }
} }
} }
// 已绑定车辆信息 // 已绑定车辆信息
.car_info{ .car_info{
//padding:0 40rpx; //padding:0 40rpx;
...@@ -671,7 +671,7 @@ export default { ...@@ -671,7 +671,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
border-bottom:2rpx solid rgba(255,225,255,.1); border-bottom:2rpx solid rgba(255,225,255,.1);
.left{ .left{
font-size: 30rpx; font-size: 30rpx;
color:#fff; color:#fff;
...@@ -692,7 +692,7 @@ export default { ...@@ -692,7 +692,7 @@ export default {
max-width:48rpx;height: 48rpx; max-width:48rpx;height: 48rpx;
} }
>view{ >view{
line-height: 1.5; line-height: 1.5;
color: #fff; color: #fff;
font-size: 26rpx; font-size: 26rpx;
...@@ -713,7 +713,7 @@ export default { ...@@ -713,7 +713,7 @@ export default {
// max-width:16rpx !important;height:20rpx !important; // max-width:16rpx !important;height:20rpx !important;
} }
} }
} }
.car_btn{ .car_btn{
width: 400rpx; width: 400rpx;
line-height: 76rpx; line-height: 76rpx;
...@@ -726,4 +726,4 @@ export default { ...@@ -726,4 +726,4 @@ export default {
color: #666; color: #666;
} }
} }
</style> </style>
\ No newline at end of file
...@@ -18,13 +18,13 @@ ...@@ -18,13 +18,13 @@
<view> <view>
<view> <view>
{{carInfo.brand + "-" + carInfo.seriesName}} {{carInfo.brand + "-" + carInfo.seriesName}}
</view> </view>
{{carInfo.carModel}} {{carInfo.carModel}}
</view> </view>
<view class="gt"> <view class="gt">
<u-icon name="arrow-right" color="#fff"></u-icon> <u-icon name="arrow-right" color="#fff"></u-icon>
</view> </view>
</view> </view>
<view class="right" style="width:400rpx;" v-else @click="getCarList"> <view class="right" style="width:400rpx;" v-else @click="getCarList">
<u--text suffixIcon="arrow-right" align="right" size="28rpx" color="#fff" iconStyle="font-size: 28rpx;color:#fff;" text="请选择"></u--text> <u--text suffixIcon="arrow-right" align="right" size="28rpx" color="#fff" iconStyle="font-size: 28rpx;color:#fff;" text="请选择"></u--text>
</view> </view>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 爱车选择弹框 --> <!-- 爱车选择弹框 -->
<u-popup :show="selectCar" mode="bottom" round="10" @close="selectCar = false"> <u-popup :show="selectCar" mode="bottom" round="10" @close="selectCar = false">
<view class="love_car_list"> <view class="love_car_list">
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</view> </view>
</view> </view>
</view> </view>
<view style="margin: 0 auto; width: 704rpx;"> <view style="margin: 0 auto; width: 704rpx;">
<image style="width: 704rpx;height: 427.4rpx;" src="http://jdnc-oss.uzosp.com/2023/02/14/c96367c6ad1d4914a6a25af82dfcdcb9.png"></image> <image style="width: 704rpx;height: 427.4rpx;" src="http://jdnc-oss.uzosp.com/2023/02/14/c96367c6ad1d4914a6a25af82dfcdcb9.png"></image>
</view> </view>
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
<view style="margin: 59rpx auto 0 auto; width: 708rpx;padding-bottom: 87rpx;"> <view style="margin: 59rpx auto 0 auto; width: 708rpx;padding-bottom: 87rpx;">
<image style="width: 708rpx;height: 1429rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/f4c2093310604cf983b50b87f9ca99a4.png"></image> <image style="width: 708rpx;height: 1429rpx;" src="http://jdnc-oss.uzosp.com/2023/01/10/f4c2093310604cf983b50b87f9ca99a4.png"></image>
</view> </view>
</view> </view>
</template> </template>
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
data() { data() {
return { return {
inputCodeShow:false, inputCodeShow:false,
//选择车辆相关 begin //选择车辆相关 begin
selectCar:false, selectCar:false,
radioValue:"", radioValue:"",
...@@ -115,11 +115,11 @@ export default { ...@@ -115,11 +115,11 @@ export default {
carList:[], carList:[],
carInfo: null, carInfo: null,
//选择车辆相关 end //选择车辆相关 end
//是否要显示图形验证码 //是否要显示图形验证码
captcha : false, captcha : false,
captchaImg : '', captchaImg : '',
actInfo: { actInfo: {
carId:'', carId:'',
vc:'', vc:'',
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
}], }],
}, },
appName: '京东挪车牌领取', appName: '京东挪车牌领取',
configData : {}, configData : {},
} }
}, },
...@@ -167,12 +167,12 @@ export default { ...@@ -167,12 +167,12 @@ export default {
}, },
// 获取爱车列表 // 获取爱车列表
getCarList(){ getCarList(){
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(!token) { if(!token) {
this.goToLogin() this.goToLogin()
return return
} }
this.$http.request({ this.$http.request({
url:'/app/vehicleAdmin/list', url:'/app/vehicleAdmin/list',
method:'get', method:'get',
...@@ -217,12 +217,12 @@ export default { ...@@ -217,12 +217,12 @@ export default {
//为true的时候加载图形验证码 //为true的时候加载图形验证码
if(that.captcha) { if(that.captcha) {
that.getCaptchaImage() that.getCaptchaImage()
this.inputCodeShow = true this.inputCodeShow = true
this.actInfo.vc = null this.actInfo.vc = null
} else { } else {
this.inputCodeShow = false this.inputCodeShow = false
} }
}) })
}, },
toJdPage() { toJdPage() {
...@@ -232,8 +232,8 @@ export default { ...@@ -232,8 +232,8 @@ export default {
//活动检查信息 //活动检查信息
submitAct() { submitAct() {
let that = this let that = this
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(!token) { if(!token) {
that.goToLogin() that.goToLogin()
return return
} }
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
that.http.httpTokenRequest(opts, that.actInfo).then(res => { that.http.httpTokenRequest(opts, that.actInfo).then(res => {
let code = res.data.code let code = res.data.code
if (code == 200) { if (code == 200) {
that.checkCaptchaInfo() that.checkCaptchaInfo()
//跳转到京东主站 //跳转到京东主站
that.toJdPage() that.toJdPage()
...@@ -263,9 +263,9 @@ export default { ...@@ -263,9 +263,9 @@ export default {
uni.$u.toast(errors[0].message) uni.$u.toast(errors[0].message)
} }
}) })
}, },
}, },
onReady() { onReady() {
this.$refs.form1.setRules(this.rules) this.$refs.form1.setRules(this.rules)
...@@ -289,10 +289,10 @@ export default { ...@@ -289,10 +289,10 @@ export default {
title: this.appName, title: this.appName,
}); });
let that = this let that = this
let token = uni.getStorageSync('userToken') let token = uni.getStorageSync('userToken1')
if(token) { if(token) {
that.checkCaptchaInfo() that.checkCaptchaInfo()
} }
}, },
} }
</script> </script>
...@@ -381,7 +381,7 @@ export default { ...@@ -381,7 +381,7 @@ export default {
} }
} }
} }
// 已绑定车辆信息 // 已绑定车辆信息
.car_info{ .car_info{
//padding:0 40rpx; //padding:0 40rpx;
...@@ -399,7 +399,7 @@ export default { ...@@ -399,7 +399,7 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
border-bottom:2rpx solid rgba(255,225,255,.1); border-bottom:2rpx solid rgba(255,225,255,.1);
.left{ .left{
font-size: 30rpx; font-size: 30rpx;
color:#fff; color:#fff;
...@@ -420,7 +420,7 @@ export default { ...@@ -420,7 +420,7 @@ export default {
max-width:48rpx;height: 48rpx; max-width:48rpx;height: 48rpx;
} }
>view{ >view{
line-height: 1.5; line-height: 1.5;
color: #fff; color: #fff;
font-size: 26rpx; font-size: 26rpx;
...@@ -441,7 +441,7 @@ export default { ...@@ -441,7 +441,7 @@ export default {
// max-width:16rpx !important;height:20rpx !important; // max-width:16rpx !important;height:20rpx !important;
} }
} }
} }
.car_btn{ .car_btn{
width: 400rpx; width: 400rpx;
line-height: 76rpx; line-height: 76rpx;
...@@ -454,4 +454,4 @@ export default { ...@@ -454,4 +454,4 @@ export default {
color: #666; color: #666;
} }
} }
</style> </style>
\ No newline at end of file
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
}, },
methods: { methods: {
pay(){ pay(){
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if(!token){ if(!token){
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/binding/index?url=/pagesC/pages/shop/detail&id=' + this.id // url: '/pages/binding/index?url=/pagesC/pages/shop/detail&id=' + this.id
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
}, 300) }, 300)
}, },
goDetail(id, link) { goDetail(id, link) {
let token = uni.getStorageSync('userToken'); let token = uni.getStorageSync('userToken1');
if (!token) { if (!token) {
let returnPage = '/pages/main'; let returnPage = '/pages/main';
let pageType = "reLaunch" let pageType = "reLaunch"
......
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
}, },
select() { select() {
let that = this let that = this
uni.chooseImage({ uni.chooseImage({
count: 1, //默认9 count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
...@@ -265,7 +265,7 @@ export default { ...@@ -265,7 +265,7 @@ export default {
// 请求头一定要加,否则 iOS 图片上传会失败 // 请求头一定要加,否则 iOS 图片上传会失败
header: { header: {
'content-type': 'multipart/form-data', 'content-type': 'multipart/form-data',
'Authorization': 'Bearer ' + uni.getStorageSync('userToken') 'Authorization': 'Bearer ' + uni.getStorageSync('userToken1')
}, },
success: (res) => { success: (res) => {
let uploadData = JSON.parse(res.data) let uploadData = JSON.parse(res.data)
......
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