mirror of
https://github.com/crmeb/CRMEB.git
synced 2026-10-29 22:10:49 +00:00
improve: 优化及问题修复
This commit is contained in:
From-wh
parent
64824d7273
commit
dfdb8ef2e9
@ -1,11 +1,3 @@
|
||||
<!--
|
||||
trees 递归显示组件
|
||||
github：https://github.com/jin-yufeng/Parser
|
||||
docs：https://jin-yufeng.github.io/Parser
|
||||
插件市场：https://ext.dcloud.net.cn/plugin?id=805
|
||||
author：JinYufeng
|
||||
update：2020/04/13
|
||||
-->
|
||||
<template>
|
||||
<view class="interlayer">
|
||||
<block v-for="(n, index) in nodes" v-bind:key="index">
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="chat-box" :style="colorStyle">
|
||||
<!-- #ifdef MP -->
|
||||
<!-- <view class="head-box">
|
||||
<!-- <view class="head-box">
|
||||
<view class="system-head" :style="{ height: sysHead }"></view>
|
||||
<view class="title-hd">
|
||||
<view class="iconfont icon-fanhui" @click="goBack"></view>
|
||||
@ -80,7 +80,8 @@
|
||||
</view>
|
||||
</view>
|
||||
<!-- 订单 -->
|
||||
<view class="order-box" v-if="item.msn_type == 6 && item.orderInfo.length" @click="goOrder(item)">
|
||||
<view class="order-box" v-if="item.msn_type == 6 && item.orderInfo.length"
|
||||
@click="goOrder(item)">
|
||||
<view class="title">{{$t(`订单号`)}}: {{ item.orderInfo.order_id }}</view>
|
||||
<view class="info">
|
||||
<image :src="item.orderInfo.cartInfo[0].productInfo.image"></image>
|
||||
@ -641,10 +642,16 @@
|
||||
padding: 0 30rpx;
|
||||
color: rgba(0, 0, 0, 0.8);
|
||||
background: #f7f7f7;
|
||||
height: 100rpx;
|
||||
height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
|
||||
/* #ifdef APP-PLUS */
|
||||
height: 70rpx;
|
||||
height: (70rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
height: calc(70rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
/* #endif */
|
||||
/* #ifndef APP-PLUS */
|
||||
height: 100rpx;
|
||||
height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
/* #endif */
|
||||
.words .icon-tupian {
|
||||
font-size: 50rpx;
|
||||
}
|
||||
@ -709,6 +716,9 @@
|
||||
|
||||
.slider-banner {
|
||||
background: #fff;
|
||||
padding-bottom: 0rpx;
|
||||
padding-bottom: calc(constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
padding-bottom: calc(env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
}
|
||||
|
||||
.words-mask {
|
||||
|
||||
@ -186,7 +186,7 @@
|
||||
}
|
||||
|
||||
.name-group {
|
||||
display: inline-flex;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
max-width: 100%;
|
||||
}
|
||||
@ -200,13 +200,15 @@
|
||||
font-weight: bold;
|
||||
font-size: 30rpx;
|
||||
color: #282828;
|
||||
line-height: 28rpx;
|
||||
}
|
||||
|
||||
.default {
|
||||
max-width: 100rpx;
|
||||
height: 28rpx;
|
||||
border: 1rpx solid var(--view-theme);
|
||||
margin-left: 20rpx;
|
||||
border-radius: 6rpx;
|
||||
padding: 0 4rpx;
|
||||
font-size: 20rpx;
|
||||
line-height: 28rpx;
|
||||
text-align: center;
|
||||
|
||||
@ -172,7 +172,7 @@
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view>{{$t(`商品总价`)}}：</view>
|
||||
<view class='money'>
|
||||
{{$t(`￥`)}}{{(parseFloat(priceGroup.totalPrice)+parseFloat(priceGroup.vipPrice)).toFixed(2)}}
|
||||
{{$t(`￥`)}}{{allPrice}}
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'
|
||||
@ -388,6 +388,7 @@
|
||||
priceGroup: {},
|
||||
animated: false,
|
||||
totalPrice: 0,
|
||||
allPrice: 0,
|
||||
integralRatio: "0",
|
||||
pagesUrl: "",
|
||||
orderKey: "",
|
||||
@ -812,6 +813,9 @@
|
||||
that.$set(that, 'totalPrice', that.$util.$h.Add(parseFloat(res.data.priceGroup.totalPrice),
|
||||
parseFloat(res.data
|
||||
.priceGroup.storePostage)));
|
||||
that.$set(that, 'allPrice', that.$util.$h.Add(parseFloat(res.data.priceGroup.totalPrice),
|
||||
parseFloat(res.data
|
||||
.priceGroup.vipPrice)).toFixed(2));
|
||||
that.$set(that, 'seckillId', parseInt(res.data.seckill_id));
|
||||
that.$set(that, 'invoice_func', res.data.invoice_func);
|
||||
that.$set(that, 'special_invoice', res.data.special_invoice);
|
||||
@ -1454,6 +1458,12 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
.order-submission {
|
||||
/* #ifdef APP-PLUS */
|
||||
padding-bottom: 70rpx;
|
||||
/* #endif */
|
||||
}
|
||||
|
||||
.order-submission .line {
|
||||
width: 100%;
|
||||
height: 3rpx;
|
||||
@ -1822,4 +1832,4 @@
|
||||
.fontC {
|
||||
color: grey;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -1602,7 +1602,6 @@
|
||||
color: #333;
|
||||
position: absolute;
|
||||
left: 30rpx;
|
||||
bottom: 110rpx;
|
||||
background-color: #fff;
|
||||
padding: 18rpx 24rpx;
|
||||
border-radius: 4rpx;
|
||||
@ -1610,11 +1609,12 @@
|
||||
-webkit-box-shadow: 0px 0px 3px 0px rgba(200, 200, 200, 0.75);
|
||||
-moz-box-shadow: 0px 0px 3px 0px rgba(200, 200, 200, 0.75);
|
||||
box-shadow: 0px 0px 3px 0px rgba(200, 200, 200, 0.75);
|
||||
// #ifdef MP
|
||||
bottom: 110rpx;
|
||||
/* #ifdef APP-PLUS */
|
||||
bottom: calc(110rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
bottom: calc(110rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
|
||||
// #endif
|
||||
/* #endif */
|
||||
.more-btn {
|
||||
color: #333;
|
||||
padding: 4rpx;
|
||||
|
||||
@ -226,7 +226,8 @@
|
||||
};
|
||||
},
|
||||
computed: mapGetters(['isLogin']),
|
||||
onShow() {
|
||||
onLoad() {
|
||||
console.log('1')
|
||||
if (this.isLogin) {
|
||||
this.page = 1;
|
||||
this.orderList = []
|
||||
@ -236,7 +237,10 @@
|
||||
this.getOrderList();
|
||||
} else {
|
||||
toLogin();
|
||||
}
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
console.log('2')
|
||||
let options = wx.getEnterOptionsSync();
|
||||
if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
|
||||
// 代表从收银台小程序返回
|
||||
|
||||
@ -88,12 +88,12 @@
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view class="message">
|
||||
<navigator url="/pages/users/user_info/index" hover-class="none">
|
||||
<navigator v-if="isLogin" url="/pages/users/user_info/index" hover-class="none">
|
||||
<view class="iconfont icon-shezhi"></view>
|
||||
</navigator>
|
||||
</view>
|
||||
<view class="message">
|
||||
<navigator url="/pages/users/message_center/index" hover-class="none">
|
||||
<navigator v-if="isLogin" url="/pages/users/message_center/index" hover-class="none">
|
||||
<view v-if="userInfo.service_num" class="num">
|
||||
{{userInfo.service_num >= 100 ? '99+' : userInfo.service_num}}
|
||||
</view>
|
||||
|
||||
@ -257,7 +257,6 @@
|
||||
});
|
||||
},
|
||||
getphonenumber(e) {
|
||||
console.log(e)
|
||||
if (e.detail.errMsg == 'getPhoneNumber:ok') {
|
||||
Routine.getCode()
|
||||
.then(code => {
|
||||
@ -546,7 +545,11 @@
|
||||
color: var(--view-theme);
|
||||
border: 1px solid var(--view-theme);
|
||||
}
|
||||
|
||||
.personal-data{
|
||||
padding-bottom: 50rpx;
|
||||
padding-bottom: calc(50rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
|
||||
padding-bottom: calc(50rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
|
||||
}
|
||||
.personal-data .wrapper {
|
||||
margin: 10rpx 0;
|
||||
background-color: #fff;
|
||||
|
||||
@ -148,7 +148,6 @@
|
||||
}
|
||||
},
|
||||
onHide() {
|
||||
console.log('hide')
|
||||
this.from = ''
|
||||
},
|
||||
onLoad(options) {
|
||||
@ -373,7 +372,8 @@
|
||||
}
|
||||
}
|
||||
formData.is_default = formData.is_default.length;
|
||||
formData.id = this.id;
|
||||
formData.id = this.id;
|
||||
|
||||
uni.showLoading({
|
||||
title: that.$t(`保存中`)
|
||||
});
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user