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

修复bug更新

Browse Source
This commit is contained in:
weipengfei 2024-04-16 17:22:51 +08:00
parent b181df093c
commit 985e88062e
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "2.0.31",
"versionCode" : 2031,
"versionName" : "2.0.33",
"versionCode" : 2033,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

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

@ -221,13 +221,13 @@
.content {
margin: 20rpx 0;
width: 470rpx;
width: 500rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
.content-head {
width: 470rpx;
width: 500rpx;
display: flex;
justify-content: space-between;
align-items: flex-end;
@ -296,7 +296,7 @@
<view class="wholeSale">
<!-- 顶部 -->
<view class="wholeSale-header">
<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
<!-- 适配不同机 -->
<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;">

2
pages/columnGoods/goods_search/index.vue
View File

@ -5,7 +5,7 @@
<view class='input acea-row row-between-wrapper'>
<text class='iconfont icon-sousuo2'></text>
<input type='text' :value='searchValue' :focus="focus" :placeholder="isShop?'点击搜索店铺名称':'点击搜索商品名称'"
placeholder-class='placeholder' @input="setValue"></input>
placeholder-class='placeholder' @input="setValue" confirm-type="search" @confirm="searchBut"></input>
</view>
<view class='bnt' @tap='searchBut'>搜索</view>
</view>

2
pages/users/order_confirm/index.vue
View File

@ -1105,7 +1105,7 @@
goStore: function(id) {
if (this.hide_mer_status != 1) {
uni.navigateTo({
url: `/pages/store/home/index?id=${id}`
url: `/pages/store/home/index?id=${id}&sale_type=${this.sale_type}`
})
}
},

2
pages/users/order_list/index.vue
View File

@ -73,7 +73,7 @@
<view class='num'>{{orderData.noComment || 0}}</view>
</view>
</view> -->
<navigator class="search acea-row row-middle" url="/pages/users/order_list/search" hover-class="none">
<navigator class="search acea-row row-middle" :url="`/pages/users/order_list/search?sale_type=${sale_type}`" hover-class="none">
<text class="iconfont icon-sousuo"></text>
搜索我的订单
</navigator>

16
pages/users/order_list/search.vue
View File

@ -4,7 +4,7 @@
<view class='header'>
<view class="search acea-row row-middle">
<text class="iconfont icon-sousuo"></text>
<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input" @confirm="handleSearch" />
<input v-model="store_name" :focus="focus" confirm-type="search" placeholder="搜索我的订单" class="input" inputmode="search" @confirm="handleSearch" />
</view>
</view>
<view class='list'>
@ -240,6 +240,7 @@
loading: false, //是否加载中
loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语
sale_type: 1,
orderList: [], //订单数组
presellProList: [], //定金预售订单
presellOrderCount: 0,
@ -290,6 +291,10 @@
this.payMode[2].payStatus = n
}
},
onLoad(options) {
if (options.status) this.orderStatus = options.status;
if (options.sale_type) this.sale_type = options.sale_type;
},
onShow() {
if (this.isLogin) {
this.page = 1;
@ -340,12 +345,6 @@
payClose: function() {
this.pay_close = false;
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
if (options.status) this.orderStatus = options.status;
},
/**
* 获取订单统计数据
*
@ -510,7 +509,8 @@
getOrderList({
page: that.page,
limit: that.limit,
store_name: that.store_name
store_name: that.store_name,
sale_type: that.sale_type
}).then(res => {
let list = res.data.list || [];
let loadend = list.length < that.limit;

4
pages/whole_sale/index.vue
View File

@ -231,13 +231,13 @@
.content {
margin: 20rpx 0;
width: 470rpx;
width: 520rpx;
display: flex;
flex-direction: column;
justify-content: space-between;
.content-head {
width: 470rpx;
width: 500rpx;
display: flex;
justify-content: space-between;
align-items: flex-end;