cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uniapp-提交订单时取消订单，提示错误

Browse Source 
uniapp-购物车编辑数量后未更新数量统计
uniapp-token失效未进行重新登录
uniapp-查看物流-点标识太大 造成部分物流信息被遮挡
This commit is contained in:
Gao xiaosong
2020-05-06 17:33:13 +08:00
parent 9ae2a1d223
commit 3a72a23bbe
10 changed files with 912 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/login.js
View File

@ -13,13 +13,16 @@ import {
} from "@/utils";
export default function toLogin(push, backUrl) {
// console.log('需要重新登录')
store.commit("LOGOUT");
// 如果没有授权，走登录的接口重新授权
// 授权获取失败会跳转到授权的接口
// console.log(store.getters.isAuthorization, '是否有登陆权限')
if (store.getters.isAuthorization) {
login()
return
}
// console.log(store.getters.isAuthorizationPage, '判断是不是登录页面或者授权页面')
// 判断当前是不是已经在登录页面或者授权页，防止二次跳转
if (store.getters.isAuthorizationPage || getCurrentPageUrl() == '/pages/user/Login/index') {
return

4
libs/wechat.js
View File

@ -39,7 +39,9 @@ export const weappPay = (option) => {
},
fail: (error) => {
console.log(error)
uni.showToast({ title: JSON.stringify(error), icon: 'none', duration: 5000 });
if (error.errMsg == 'requestPayment:fail cancel') {
uni.showToast({ title: '已取消支付', icon: 'none', duration: 5000 });
}
reject(error)
}
})

7
manifest.json
View File

@ -75,6 +75,13 @@
}
},
"ad" : {}
},
"splashscreen" : {
"ios" : {
"iphone" : {
"portrait-896h@3x" : "/Users/piao/Downloads/意(1)/1242+2688.png"
}
}
}
}
},

706
pages/order/Logistics/index.vue
View File

@ -1,381 +1,397 @@
<template>
<view class="logistics">
<view class="header acea-row row-between row-top" v-for="cart in cartInfo" :key="cart.id">
<view class="pictrue">
<image :src="cart.productInfo.image" />
</view>
<view class="text acea-row row-between">
<view class="name line2">{{ cart.productInfo.store_name }}</view>
<view class="money">
<view>￥{{ cart.truePrice }}</view>
<view>x{{ cart.cart_num }}</view>
</view>
</view>
</view>
<view class="logisticsCon" style="margin-bottom: 5px">
<view class="company acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper">
<view class="iconfont icon-wuliu"></view>
<view class="text">
<view>
<text class="name line1">物流公司：</text>
{{ orderInfo.deliveryName }}
</view>
<view class="express line1">
<text class="name">快递单号：</text>
{{ orderInfo.deliveryId }}
</view>
</view>
</view>
<view class="copy acea-row row-center-wrapper copy-data" @click="copyClipboard(orderInfo.deliveryId)">复制单号</view>
</view>
<view class="item" v-for="(express, expressListIndex) in expressList" :key="expressListIndex">
<view class="circular" :class="expressListIndex === 0 ? 'on' : ''"></view>
<view class="text">
<view :class="expressListIndex === 0 ? 'font-color-red' : ''">{{ express.status }}</view>
<view class="data">{{ express.time }}</view>
</view>
</view>
</view>
<view class="logistics">
<view class="header acea-row row-between row-top" v-for="cart in cartInfo" :key="cart.id">
<view class="pictrue">
<image :src="cart.productInfo.image" />
</view>
<view class="text acea-row row-between">
<view class="name line2">{{ cart.productInfo.store_name }}</view>
<view class="money">
<view>￥{{ cart.truePrice }}</view>
<view>x{{ cart.cart_num }}</view>
</view>
</view>
</view>
<view class="logisticsCon" style="margin-bottom: 5px">
<view class="company acea-row row-between-wrapper">
<view class="picTxt acea-row row-between-wrapper">
<view class="iconfont icon-wuliu"></view>
<view class="text">
<view>
<text class="name line1">物流公司：</text>
{{ orderInfo.deliveryName }}
</view>
<view class="express line1">
<text class="name">快递单号：</text>
{{ orderInfo.deliveryId }}
</view>
</view>
</view>
<view
class="copy acea-row row-center-wrapper copy-data"
@click="copyClipboard(orderInfo.deliveryId)"
>复制单号</view>
</view>
<view class="item" v-for="(express, expressListIndex) in expressList" :key="expressListIndex">
<view class="circular" :class="expressListIndex === 0 ? 'on' : ''"></view>
<view class="text">
<view :class="expressListIndex === 0 ? 'font-color-red' : ''">{{ express.status }}</view>
<view class="data">{{ express.time }}</view>
</view>
</view>
</view>
<!-- 物流进度条 -->
<view class="div-bg bg-white" style="font-size:12px; background:#fff;">
<!--物流跟踪-->
<view style="margin-bottom:5px;">
<view class="bg-white" style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;padding-top: 10px">
<view style="font-size: 26rpx;color: #111111; margin: 5px 0">
物流跟踪
<!--物流跟踪-->
</view>
<view>
<view class="track-rcol">
<view class="track-list">
<view>
<view v-for="(item,logisticsListindex) in logisticsList" :key="logisticsListindex">
<view class="active" v-if="logisticsListindex===0">
<view></view>
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
<view v-if="logisticsListindex > 0 && logisticsListindex !== logisticsList.length-1">
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
<view v-if="logisticsListindex === logisticsList.length-1" class="finall">
<i class="div-spilander"></i>
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 物流进度条 -->
<view class="div-bg bg-white" style="font-size:12px; background:#fff;">
<!--物流跟踪-->
<view style="margin-bottom:5px;">
<view
class="bg-white"
style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;padding-top: 10px"
>
<view style="font-size: 26rpx;color: #111111; margin: 5px 0">
物流跟踪
<!--物流跟踪-->
</view>
<view>
<view class="track-rcol">
<view class="track-list">
<view>
<view
class="track-list-item"
v-for="(item,logisticsListindex) in logisticsList"
:key="logisticsListindex"
>
<view class="active" v-if="logisticsListindex===0">
<view></view>
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
<view
v-if="logisticsListindex > 0 && logisticsListindex !== logisticsList.length-1"
>
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
<view v-if="logisticsListindex === logisticsList.length-1" class="finall">
<i class="div-spilander"></i>
<i class="node-icon"></i>
<text class="txt">{{item.acceptStation}}</text>
<text class="time">{{item.acceptTime}}</text>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="no-express" v-if="loaded && !expressList.length">
<image src="@/static/images/noExpress.png" />
</view>
<Recommend></Recommend>
</view>
<view class="no-express" v-if="loaded && !expressList.length">
<image src="@/static/images/noExpress.png" />
</view>
<Recommend></Recommend>
</view>
</template>
<script>
import Recommend from "@/components/Recommend";
import {
express,
orderDetail
} from "@/api/order";
import {
copyClipboard
} from "@/utils";
import Recommend from "@/components/Recommend";
import { express, orderDetail } from "@/api/order";
import { copyClipboard } from "@/utils";
const NAME = "Logistics";
const NAME = "Logistics";
export default {
name: NAME,
components: {
Recommend
},
data: function() {
return {
id: "",
cartInfo: [],
orderInfo: {},
expressList: [],
loaded: false,
logisticsList: [{
message: "暂无数据",
messageDate: ""
}]
};
},
watch: {
$yroute(n) {
if (n.name === NAME && this.$yroute.query.id !== this.id) {
this.id = this.$yroute.query.id;
this.getExpress();
}
}
},
mounted: function() {
this.id = this.$yroute.query.id;
this.getExpress();
},
methods: {
copyClipboard,
getExpressInfo() {
let params = {
orderCode: this.id,
shipperCode: this.orderInfo.deliverySn,
logisticCode: this.orderInfo.deliveryId
};
express(params)
.then(res => {
this.logisticsList = res.data.traces.reverse();
})
.catch(err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
duration: 2000
});
});
},
getExpress() {
if (!this.id) {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
duration: 2000
});
return
}
this.loaded = false;
orderDetail(this.id)
.then(res => {
this.orderInfo = {
deliveryId: res.data.deliveryId,
deliveryName: res.data.deliveryName,
deliverySn: res.data.deliverySn
};
this.getExpressInfo();
// const result = res.data.express.result || {};
// this.cartInfo = res.data.order.cartInfo;
// this.expressList = result.list || [];
// this.loaded = true;
})
.catch(err => {
uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message,
icon: 'none',
duration: 2000
});
});
}
}
};
export default {
name: NAME,
components: {
Recommend
},
data: function() {
return {
id: "",
cartInfo: [],
orderInfo: {},
expressList: [],
loaded: false,
logisticsList: [
{
message: "暂无数据",
messageDate: ""
}
]
};
},
watch: {
$yroute(n) {
if (n.name === NAME && this.$yroute.query.id !== this.id) {
this.id = this.$yroute.query.id;
this.getExpress();
}
}
},
mounted: function() {
this.id = this.$yroute.query.id;
this.getExpress();
},
methods: {
copyClipboard,
getExpressInfo() {
let params = {
orderCode: this.id,
shipperCode: this.orderInfo.deliverySn,
logisticCode: this.orderInfo.deliveryId
};
express(params)
.then(res => {
this.logisticsList = res.data.traces.reverse();
})
.catch(err => {
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
});
},
getExpress() {
if (!this.id) {
uni.showToast({
title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
return;
}
this.loaded = false;
orderDetail(this.id)
.then(res => {
this.orderInfo = {
deliveryId: res.data.deliveryId,
deliveryName: res.data.deliveryName,
deliverySn: res.data.deliverySn
};
this.getExpressInfo();
// const result = res.data.express.result || {};
// this.cartInfo = res.data.order.cartInfo;
// this.expressList = result.list || [];
// this.loaded = true;
})
.catch(err => {
uni.showToast({
title:
err.msg || err.response.data.msg || err.response.data.message,
icon: "none",
duration: 2000
});
});
}
}
};
</script>
<style scoped lang="less">
.no-express {
margin: 1.5*100rpx 0;
}
.no-express {
margin: 1.5 * 100rpx 0;
}
.no-express image {
width: 6*100rpx;
margin: 0 auto;
display: block;
}
.no-express image {
width: 6 * 100rpx;
margin: 0 auto;
display: block;
}
.message-text {
font-family: MicrosoftYaHei;
font-size: 1*100rpx;
font-weight: normal;
font-stretch: normal;
line-height: 3*100rpx;
letter-spacing: 0*100rpx;
color: #333333;
width: 50%;
}
.message-text {
font-family: MicrosoftYaHei;
font-size: 1 * 100rpx;
font-weight: normal;
font-stretch: normal;
line-height: 3 * 100rpx;
letter-spacing: 0 * 100rpx;
color: #333333;
width: 50%;
}
.fontblack {
color: #999999;
}
.fontblack {
color: #999999;
}
.img2 {
width: 0.81*100rpx;
height: 0.8*100rpx;
float: right;
}
.img2 {
width: 0.81 * 100rpx;
height: 0.8 * 100rpx;
float: right;
}
.addressshow2 {
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
width: 75%;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1*100rpx;
}
.addressshow2 {
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
width: 75%;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1 * 100rpx;
}
.addressshow1 {
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
width: 75%;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1*100rpx;
}
.addressshow1 {
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
width: 75%;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1 * 100rpx;
}
.orderTitle {
font-size: 1*100rpx;
color: #333333;
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
height: 2.5*100rpx;
}
.orderTitle {
font-size: 1 * 100rpx;
color: #333333;
height: auto;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
height: 2.5 * 100rpx;
}
.orderDetail {
font-size: 0.26*100rpx;
color: #666666;
text-align: left;
}
.orderDetail {
font-size: 0.26 * 100rpx;
color: #666666;
text-align: left;
}
.border-ceter {
width: 92%;
padding-left: 15px;
padding-right: 15px;
}
.border-ceter {
width: 92%;
padding-left: 15px;
padding-right: 15px;
}
.pay-button {
width: 88%;
height: 2.6*100rpx;
position: relative;
background-color: red;
color: white;
.pay-button {
width: 88%;
height: 2.6 * 100rpx;
position: relative;
background-color: red;
color: white;
margin-left: 6%;
}
margin-left: 6%;
}
ul view {
list-style: none;
font-size: 0.24*100rpx;
}
ul view {
list-style: none;
font-size: 0.24 * 100rpx;
}
ul {}
ul {
}
.track-rcol {}
.track-rcol {
}
.track-list {
position: relative;
}
.track-list {
position: relative;
}
.track-list view {
position: relative;
padding: 0 0 0.5*100rpx 5px;
line-height: 0.3*100rpx;
border-left: 1px solid #d9d9d9;
color: #999;
}
.track-list > view {
position: relative;
padding: 0 0 0.5 * 100rpx 20rpx;
}
.track-list .track-list-item {
position: relative;
padding: 0 0 0.5 * 100rpx 20rpx;
line-height: 0.3 * 100rpx;
border-left: 1px solid #d9d9d9;
color: #999;
}
.track-list view.first {
color: red;
padding-top: 0;
width: 100%;
text-align: left;
border-left: 1px solid #d9d9d9;
}
.track-list view.first {
color: red;
padding-top: 0;
width: 100%;
text-align: left;
border-left: 1px solid #d9d9d9;
}
.track-list view.node-icon {
position: absolute;
left: -6.5px;
border-radius: 50%;
width: 0.2*100rpx;
height: 0.2*100rpx;
top: 4px;
background-color: #b2b2b2;
}
.track-list view.node-icon {
position: absolute;
left: -6.5px;
border-radius: 50%;
width: 0.2 * 100rpx;
height: 0.2 * 100rpx;
top: 4px;
background-color: #b2b2b2;
padding: 0 !important;
}
.track-list view.active .node-icon {
background-position: 0-72px;
background-color: #ea7c0a;
width: 0.3*100rpx;
z-index: 2;
height: 0.3*100rpx;
position: absolute;
left: -0.19*100rpx;
top: 0;
border-radius: 50%;
}
.track-list view.active .node-icon {
background-position: 0 -72px;
background-color: #ea7c0a;
width: 0.3 * 100rpx;
z-index: 2;
height: 0.3 * 100rpx;
position: absolute;
left: -0.19 * 100rpx;
top: 0;
border-radius: 50%;
}
.track-list view.time {
margin-right: 20px;
position: relative;
top: 4px;
display: inline-block;
vertical-align: middle;
color: #999;
width: 100%;
text-align: left;
}
.track-list view.time {
margin-right: 20px;
position: relative;
top: 4px;
display: inline-block;
vertical-align: middle;
color: #999;
width: 100%;
text-align: left;
}
.track-list view.txt {
position: relative;
display: inline-block;
vertical-align: top;
color: #999;
left: 0.2*100rpx;
top: 0.04*100rpx;
}
.track-list view.txt {
position: relative;
display: inline-block;
vertical-align: top;
color: #999;
left: 0.2 * 100rpx;
top: 0.04 * 100rpx;
}
.track-list view.first .time {
text-align: left;
width: 94%;
color: red;
}
.track-list view.first .time {
text-align: left;
width: 94%;
color: red;
}
.track-list view.first .txt {
color: red;
text-align: left;
width: 94%;
}
.track-list view.first .txt {
color: red;
text-align: left;
width: 94%;
}
.track-list view.finall {
position: relative;
padding: 0px 0 0.5*100rpx 5px;
line-height: 18px;
border-color: white;
border-left: 1px solid #ffffff;
color: #999;
}
.track-list view.finall {
padding: 0px 0 0.5 * 100rpx 5px;
line-height: 18px;
border-color: white;
border-left: 1px solid #ffffff;
color: #999;
}
.track-list view.finall .div-spilander {
width: 1px;
position: absolute;
left: -1.5px;
height: 0.5*100rpx;
background-color: #d9d9d9;
}
.track-list view.finall .div-spilander {
width: 1px;
position: absolute;
left: -1.5px;
height: 0.5 * 100rpx;
background-color: #d9d9d9;
}
</style>

2
pages/order/OrderDetails/index.vue
View File

@ -542,8 +542,6 @@ export default {
}
},
goBack() {
const history = this.app.history,
last = history[history.length - 1] || {};
if (last.name === "MyOrder") return this.$yrouter.back();
else
return this.$yrouter.replace({

4
pages/order/OrderSubmission/index.vue
View File

@ -90,8 +90,8 @@
</view>
</view>
<view class="item">
<view>备注信息</view>
<textarea placeholder="请添加备注（150字以内）" v-model="mark"></textarea>
<view>备注信息（150字以内）</view>
<textarea v-model="mark"></textarea>
</view>
</view>
<view class="wrapper">

990
pages/shop/ShoppingCart/index.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/user/signIn/Sign/index.vue
View File

@ -101,6 +101,7 @@
};
},
mounted: function() {
uni.showLoading({ title: "加载中", mask: true });
this.signUser();
this.signConfig();
this.getSignList();
@ -129,6 +130,7 @@
postSignUser({
sign: 1
}).then(res => {
uni.hideLoading();
res.data.integral = parseInt(res.data.integral);
var sumSginDay = res.data.sumSignDay;
that.userInfo = res.data;
@ -180,4 +182,4 @@
}
}
};
</script>
</script>

24
utils/index.js
View File

@ -113,16 +113,18 @@ export const copyClipboard = (data) => {
export const replaceLogin = (msg) => {
uni.hideLoading();
uni.showToast({
title: msg,
title: '重新登录中...',
icon: 'none',
duration: 2000
});
// 这里代表已经失去登录状态以及401强制推出登录了
store.commit('LOGOUT')
console.log('如果是微信小程序，跳转到授权页', Vue.prototype.$deviceType, msg)
if (Vue.prototype.$deviceType == 'routine') {
// 如果是微信小程序，跳转到授权页
login({
fail: () => {
console.log('如果是微信小程序，跳转到授权页')
replace({
path: '/pages/authorization/index',
query: {
@ -174,6 +176,10 @@ export const authorize = (authorizeStr) => {
resolve('获取授权成功')
},
fail() {
switchTab({
path: '/pages/home/index',
// query
});
reject('获取授权失败')
}
})
@ -250,13 +256,14 @@ export const login = (option) => {
export const handleGetUserInfo = () => {
getUser().then(res => {
console.log('获取用户信息')
store.dispatch('setUserInfo', res.data)
var pages = getCurrentPages() //获取加载的页面
var currentPage = pages[pages.length - 1] //获取当前页面的对象
let url = "/pages/home/index"
let query = {}
console.log('currentPage')
if (currentPage) {
// 获取到最后一个页面
if (
@ -276,16 +283,21 @@ export const handleGetUserInfo = () => {
}
}
}
console.log(url)
if (url == '/pages/home/index' || url == '/pages/shop/GoodsClass/index' || url == '/pages/shop/ShoppingCart/index' || url == '/pages/user/User/index') {
switchTab({
path: `${url}`,
query
});
} else {
push({
path: `${url}`,
query
})
switchTab({
path: '/pages/home/index',
// query
});
// push({
// path: `${url}`,
// query
// })
}
})
}

7
utils/request.js
View File

@ -10,10 +10,12 @@ fly.config.baseURL = VUE_APP_API_URL
fly.interceptors.response.use(
response => {
console.log(response)
// 定时刷新access-token
return response;
},
error => {
console.log(error)
if (error.toString() == 'Error: Network Error') {
toLogin();
return Promise.reject({ msg: "未登录", toLogin: true });
@ -47,18 +49,15 @@ function baseRequest(options) {
// 提示错误信息
return Promise.reject({ msg: "未登录", toLogin: true });
}
console.log(options)
// 结构请求需要的参数
const { url, params, data, login, ...option } = options
// 发起请求
return fly.request(url, params || data, {
...option
}).then(res => {
console.log(res)
}).then(res => {
const data = res.data || {};
if (res.status !== 200) {
return Promise.reject({ msg: "请求失败", res, data });
}
if ([410000, 410001, 410002].indexOf(data.status) !== -1) {