zhuce
/
lilishop-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一些可见的问题

master
lemon橪 2021-07-02 17:58:49 +08:00
parent 3294f12268
commit 96d42cdab8
4 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/api.js
View File

@ -4,10 +4,10 @@
*/
// 开发环境
const dev = {
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
common: "http://192.168.0.109:8890",
buyer: "http://192.168.0.109:8888",
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
// common: "http://192.168.0.109:8890",
// buyer: "http://192.168.0.109:8888",
};
// 生产环境
const prod = {

15
pages/order/fillorder.vue
View File

@ -119,8 +119,8 @@
<!-- 优惠券 -->
<div class="box box4">
<u-row>
<u-col :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
<u-col :span="3" textAlign="right" @click="shippingFlag = true">
<u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :offset="0" :span="9" @click="shippingFlag = true">配送方式</u-col>
<u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="3" textAlign="right" @click="shippingFlag = true">
{{ shippingMethod.find(e=>{ return e.value == shippingText; }).label }}
</u-col>
</u-row>
@ -150,8 +150,8 @@
</div>
<div>
<u-row>
<u-col :span="7">运费</u-col>
<u-col :span="5" class="tr tipsColor" textAlign="right">
<u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="7">运费</u-col>
<u-col v-if="orderMessage.cartTypeEnum != 'VIRTUAL'" :span="5" class="tr tipsColor" textAlign="right">
<u-tag v-if="orderMessage.priceDetailDTO.freightPrice == 0" style="margin-right: 20rpx" color="#FF6262" text="包邮" type="warning" size="mini" mode="plain" shape="circle" />
<span>￥{{
orderMessage.priceDetailDTO.freightPrice | unitPrice
@ -181,7 +181,7 @@
</div>
<!-- 配送地区没有提示 -->
<div class="notSupportFreight">
<div class="notSupportFreight" v-if="notSupportFreight.length !=0">
<u-notice-bar style="width:100%" :volume-icon="false" mode="horizontal" :list="notSupportFreightGoodsList"></u-notice-bar>
</div>
@ -530,7 +530,10 @@ export default {
res.data.result.memberAddress.consigneeAddressPath.split(",");
}
if (res.data.result.notSupportFreight.length != 0) {
if (
res.data.result.notSupportFreight &&
res.data.result.notSupportFreight.length != 0
) {
this.notSupportFreight = res.data.result.notSupportFreight;
res.data.result.notSupportFreight.forEach((item) => {

18
pages/tabbar/user/my.vue
View File

@ -15,7 +15,9 @@
<view class="user-name">登录/注册</view>
</view>
<u-icon name="arrow-right"></u-icon>
<u-icon style="display: flex;
align-items: flex-start;" name="arrow-right"></u-icon>
</view>
<!-- 积分，优惠券，关注， -->
<div class="pointBox">
@ -247,11 +249,12 @@ body {
justify-content: space-between;
.head-1 {
text-align: center;
width: 144rpx;
width: 152rpx;
position: relative;
margin-top: 40rpx;
display: flex;
align-items: center;
image {
width: 144rpx;
width: 152rpx;
height: 144rpx;
border-radius: 50%;
margin-bottom: 30rpx;
@ -282,11 +285,12 @@ body {
.head-2 {
flex: 1;
margin-left: 30rpx;
line-height: 2em;
margin-top: 60rpx;
margin-top: 100rpx;
line-height: 1;
}
/deep/ .u-icon,
.u-icon {
margin-top: -120rpx;
margin-top: 106rpx;
}
}
.pointBox {

12
pages/tabbar/user/utils/tool.vue
View File

@ -73,18 +73,20 @@ export default {
distribution().then((res) => {
if (res.data.result) {
let type = res.data.result.distributionStatus;
uni.navigateTo({
url: "/pages/mine/distribution/auth",
});
return
if (type == "PASS") {
uni.navigateTo({
url: "/pages/mine/distribution/home",
});
} else if (type == "RETREAT" || type == "REFUSE") {
} else if (type == "REFUSE") {
uni.navigateTo({
url: "/pages/mine/distribution/auth",
});
} else if (type == "RETREAT") {
uni.showToast({
title: "您的分销资格已被清退。请联系管理员！",
duration: 2000,
icon: "none",
});
} else {
uni.showToast({
title: "您的信息正在审核",