mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-03-16 18:01:30 +08:00
parent 53d0fea4ce
commit 56f7a47599
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/cloud_warehouse/home/home.vue
View File

@ -206,7 +206,7 @@
<!-- 适配不同机 -->
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
<view style="display: flex;font-weight: bold;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
</view>
</view>

2
pages/cloud_warehouse/market/market.vue
View File

@ -300,7 +300,7 @@
<!-- 适配不同机 -->
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;justify-content: space-between;">
<view style="display: flex;font-weight: bold;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20"
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20"
color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
<view style="display: flex;" @click="changeMap">
<view style="width: 250rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right;">{{street}}</view>

2
pages/cloud_warehouse/specialty/specialty.vue
View File

@ -206,7 +206,7 @@
<!-- 适配不同机 -->
<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
<view style="display: flex;font-weight: bold;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>名优特产</view>
</view>
</view>

5
pages/order_addcart/order_addcart.vue
View File

@ -51,7 +51,8 @@
<view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text>
</navigator>
<view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view>
<view class="coupon-btn" style="width: auto;padding: 0 10rpx;">{{item.cloud_warehouse}}</view>
<!-- <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view> -->
</view>
<navigator v-for="goods in item.list" :key="goods.cart_id"
:url='"/pages/goods_details/index?id="+goods.product.product_id' hover-class='none'
@ -1078,6 +1079,7 @@
border-bottom: 1px solid #f0f0f0;
.checkbox {
flex-shrink: 0;
width: 60rpx;
.iconfont {
@ -1114,6 +1116,7 @@
}
.coupon-btn {
flex-shrink: 0;
color: var(--view-theme);
font-size: 22rpx;
width: 100rpx;

26
pages/whole_sale/index.vue
View File

@ -183,6 +183,9 @@
}
}
}
.color{
color: #40ae36;
}
}
}
</style>
@ -256,14 +259,17 @@
<!-- 综合查询 -->
<view class="comprehensive">
<view class="comprehensive-price">
<view class="comprehensive-price" :class="{'color': orderCurr==1}" @click="toOrder('price', 1)">
<text>价格</text>
<image src="@/static/new_define/priceChange.png"></image>
</view>
<view class="comprehensive-sales_num">
<view class="comprehensive-sales_num" @click="toOrder('sales', 2)">
<text>销量</text>
</view>
<view class="comprehensive-discount">
<view class="comprehensive-discount" v-if="tabsCurr!=1" @click="toOrder('', 3)">
<text>综合</text>
</view>
<view class="comprehensive-discount" v-else >
<text>抵扣</text>
<image class="loudou" src="@/static/new_define/loudou.png"></image>
</view>
@ -312,6 +318,7 @@
val: 3
}],
tabsCurr: 1,
orderCurr: 3, //当前选择的排序类型
newData: {},
activeRouter: '',
hostProduct: [],
@ -329,6 +336,7 @@
cate_id: '',
keyword: '',
deduction_rate: '', //抵扣比例
order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
}
}
},
@ -344,6 +352,13 @@
this.getProductslist();
},
methods: {
toOrder(type){
if(type=='price'){
if(this.where.order=='price_asc') this.where.order = 'price_desc';
else this.where.order = 'price_asc';
}else this.where.order = type;
this.getProductslist(true);
},
navTo(url){
uni.navigateTo({
url:url,
@ -372,8 +387,9 @@
this.where = {
page: 1,
limit: this.where.limit,
sale_type: 2,
keyword: this.where.keyword
sale_type: this.where.sale_type,
keyword: this.where.keyword,
order: this.where.order
}
this.cate_change = 0;
this.cate_change_children = 0;