fix: 代码优化
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
<view class="address-popup-view">
|
||||
<view class="head-view">
|
||||
<text class="text-32 text-zu1 text-bold">{{ headText }}</text>
|
||||
<MyBtn text="确定" @ok="onOk" v-if="!dataList.length" mh="48rpx" wd="128rpx" fz="24rpx"></MyBtn>
|
||||
<!-- <MyBtn text="确定" @ok="onOk" v-if="!dataList.length" mh="48rpx" wd="128rpx" fz="24rpx"></MyBtn> -->
|
||||
<u-icon size="48rpx" name="close-circle-fill" color="#333" @click="onClose"></u-icon>
|
||||
</view>
|
||||
<scroll-view :scroll-x="true" class="address-select-view">
|
||||
|
||||
+6
-6
@@ -10,12 +10,6 @@
|
||||
},
|
||||
"pages": [
|
||||
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
|
||||
{
|
||||
"path": "pages/order_package/launch_page/launch_page",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "pages/home/home",
|
||||
"style": {
|
||||
@@ -238,6 +232,12 @@
|
||||
{
|
||||
"root": "pages/order_package",
|
||||
"pages": [
|
||||
{
|
||||
"path": "launch_page/launch_page",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "order_submit/order_submit",
|
||||
"style": {
|
||||
|
||||
+1
-3
@@ -84,8 +84,7 @@
|
||||
@click="jumpOrder(item)">
|
||||
<up-image :src="item.url" width="28" height="28" bgColor="#f1f6ff00"></up-image>
|
||||
<view>{{ item.title }}</view>
|
||||
<up-badge :absolute="true" :offset="[0, 8]" max="99"
|
||||
:value="statisticsObj[item.note]"></up-badge>
|
||||
<up-badge :absolute="true" :offset="[-9, 9]" max="99" :customStyle="{ width: '40rpx', height: '32rpx', borderRadius: '45% 45% 45% 0', display: 'flex', alignItems: 'center', justifyContent: 'center', padding: 0 }" :value="statisticsObj[item.note]"></up-badge>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -641,7 +640,6 @@ export default {
|
||||
|
||||
.mine_data {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.mine_info_not_login {
|
||||
|
||||
@@ -128,7 +128,11 @@ export default {
|
||||
onItemSelect(item,xItem){
|
||||
this.curSelectList.push(xItem);
|
||||
this.curSelect++;
|
||||
this.getAddressList(xItem.id);
|
||||
this.getAddressList(xItem.id).then(() => {
|
||||
if (!this.addressList.length) {
|
||||
this.onOk();
|
||||
}
|
||||
});
|
||||
},
|
||||
onSelect(item,index){
|
||||
this.curSelectList.splice(index + 1);
|
||||
|
||||
@@ -30,6 +30,12 @@
|
||||
" class="order_item_header_right" :style="{ color: ORDER_STATUS_CSS[item.status] }">
|
||||
{{ getValue(ORDER_STATUS, item.status) }}
|
||||
</view>
|
||||
<!-- 售后显示订单状态 -->
|
||||
<view v-if="
|
||||
form.type == MINE_ORDER_TYPE.AFTER_SALE
|
||||
" class="order_item_header_right" :style="{ color: ORDER_STATUS_CSS[item.status] }">
|
||||
{{ getValue(ORDER_STATUS, item.status) }}
|
||||
</view>
|
||||
<!-- 待付款 -->
|
||||
|
||||
<view v-if="
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
</view>
|
||||
<up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
|
||||
</view>
|
||||
<view class="concrete_item">
|
||||
<!-- <view class="concrete_item">
|
||||
<view class="concrete_item_">
|
||||
<view class="concrete_item_title">收货地址</view>
|
||||
<view class="concrete_item_value" @click="jumpAddAddress">
|
||||
@@ -89,8 +89,7 @@
|
||||
<view class="address_warp" v-else>{{ adressInfo }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <up-image src="/static/common/right.png" width="20" height="20" bgColor="#f1f6ff00"></up-image> -->
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="concrete_item" v-if="adressInfo">
|
||||
<view class="concrete_item_">
|
||||
<view class="concrete_item_title">运费</view>
|
||||
@@ -145,7 +144,7 @@
|
||||
<view class="product_but_warp">
|
||||
<view class="product_but_left">
|
||||
<view class="left_item">
|
||||
<up-image src="/static/product/home.png" width="20" height="20" bgColor="#f1f6ff00"
|
||||
<up-image src="/static/column/home.png" width="20" height="20" bgColor="#f1f6ff00"
|
||||
@click="jumpOther('home')"></up-image>
|
||||
<view>首页</view>
|
||||
</view>
|
||||
@@ -154,7 +153,7 @@
|
||||
@click="onZiXun"></up-image>
|
||||
<view>咨询</view>
|
||||
</view>
|
||||
<view class="left_item" v-if="!isShowCart && !isCoupon">
|
||||
<view class="left_item" >
|
||||
<up-image src="/static/product/cart.png" width="24" height="20" bgColor="#f1f6ff00"
|
||||
@click="jumpOther('cart')"></up-image>
|
||||
<view>购物车</view>
|
||||
@@ -164,7 +163,9 @@
|
||||
<view v-if="!isShowCart && !isCoupon" class="but_comm join_warp" @click="checkSpecification(true, 'addCart')">
|
||||
加入购物车
|
||||
</view>
|
||||
<!-- 限时秒杀现在要改为展示购物车icon 并且立即购买按钮变长一点 -->
|
||||
<view class="but_comm buy_warp" :class="{ 'border-16': isShowCart || isCoupon }"
|
||||
:style="isCoupon ? 'width: 400rpx' : ''"
|
||||
@click="checkSpecification(true, 'buy')">
|
||||
立即购买
|
||||
</view>
|
||||
@@ -871,6 +872,8 @@ export default {
|
||||
if (resp && resp.bizcode === 100) {
|
||||
const data = resp.data;
|
||||
// 限时秒杀 和 积分兑换 不需要购物车
|
||||
|
||||
//限时秒杀现在要改为展示购物车icon
|
||||
this.isShowCart = this.activedType === 'seckill' || data.type == 3 ? 1 : 0;
|
||||
// 商品图
|
||||
if (data.goodsGraph) {
|
||||
|
||||
@@ -9,9 +9,12 @@
|
||||
<!-- #endif -->
|
||||
</Header>
|
||||
<view class="setting-view">
|
||||
<view class="name-box">
|
||||
<view class="name-box" v-if="dataList.length">
|
||||
<PingItem @ok="onJumpShop" style="margin-top:24rpx" :obj="item" v-for="(item,index) in dataList" :key="index"></PingItem>
|
||||
</view>
|
||||
<view class="bottom-scroll-no " v-else>
|
||||
<text class="text-32" >暂无数据</text>
|
||||
</view>
|
||||
</view>
|
||||
<up-toast ref="uToastRef"></up-toast>
|
||||
</view>
|
||||
@@ -75,6 +78,16 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.bottom-scroll-no{
|
||||
width:100%;
|
||||
position: absolute;
|
||||
top:50%;
|
||||
color: #999;
|
||||
transform: translate(-50%,-50%);
|
||||
left: 50%;
|
||||
text-align: center;
|
||||
|
||||
}
|
||||
.bottom-btn{
|
||||
width: 100%;
|
||||
margin-bottom:92rpx;
|
||||
|
||||
@@ -77,6 +77,9 @@ export const ORDER_STATUS = [
|
||||
}, {
|
||||
key: 5,
|
||||
name: "交易关闭"
|
||||
}, {
|
||||
key: 7,
|
||||
name: "退款成功"
|
||||
}
|
||||
]
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user