feat: 修改配置文件和页面逻辑,优化商品采购和订单获取功能
This commit is contained in:
parent
1f200c6b12
commit
56217754ec
|
@ -17,7 +17,7 @@ switch (env) {
|
|||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||
break;
|
||||
case 'local':
|
||||
BASE_URL = 'http://192.168.1.8:8545';
|
||||
BASE_URL = 'http://192.168.1.22:8545';
|
||||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||
break;
|
||||
default:
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
<view style="background-color: #ffffff;">
|
||||
<up-sticky offset-top="0" style="background-color: #ffffff;">
|
||||
<view class="navbar">
|
||||
<view style="width: 580rpx;">
|
||||
<view style="width:35%;">
|
||||
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
||||
:showAction="false"></up-search>
|
||||
</view>
|
||||
<view class="nav-item" @click="calendarShow=true">
|
||||
<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
|
||||
|
||||
<text>筛选日期</text>
|
||||
<view style="width:65%;padding-left: 10rpx;">
|
||||
<uni-datetime-picker v-model="range" type="daterange" @change="calendarConfirm" />
|
||||
</view>
|
||||
</view>
|
||||
</up-sticky>
|
||||
|
@ -50,8 +48,6 @@
|
|||
</up-transition>
|
||||
</view>
|
||||
</view>
|
||||
<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
|
||||
:closeOnClickOverlay="true" mode="range"></up-calendar>
|
||||
|
||||
</template>
|
||||
|
||||
|
@ -80,7 +76,7 @@
|
|||
|
||||
const calendarConfirm = (e) => {
|
||||
where.value.start_time = e[0];
|
||||
where.value.end_time = e[(e.length)-1];
|
||||
where.value.end_time = e[1];
|
||||
goodsList1.value=[]
|
||||
getGoodsList()
|
||||
calendarShow.value = false
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
<view style="background-color: #ffffff;">
|
||||
<up-sticky offset-top="0" style="background-color: #ffffff;">
|
||||
<view class="navbar">
|
||||
<view style="width: 580rpx;">
|
||||
<view style="width:55%;">
|
||||
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
||||
:showAction="false"></up-search>
|
||||
</view>
|
||||
<view class="nav-item" @click="calendarShow=true">
|
||||
<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
|
||||
|
||||
<text>筛选日期</text>
|
||||
<view style="width:45%;padding-left: 10rpx;">
|
||||
<uni-datetime-picker v-model="range" type="date" @change="calendarConfirm" />
|
||||
</view>
|
||||
</view>
|
||||
</up-sticky>
|
||||
|
@ -50,7 +48,7 @@
|
|||
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
|
||||
</up-list-item>
|
||||
</up-list>
|
||||
<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
||||
<up-empty v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
||||
</up-empty>
|
||||
</up-transition>
|
||||
<up-modal :show="show" title="采购确认" showCancelButton @cancel="show=false" @confirm="offerUpdate()">
|
||||
|
@ -72,9 +70,6 @@
|
|||
|
||||
</view>
|
||||
</view>
|
||||
<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
|
||||
:closeOnClickOverlay="true"></up-calendar>
|
||||
|
||||
</template>
|
||||
|
||||
|
||||
|
@ -91,18 +86,13 @@
|
|||
SystemStoreStorageLists,
|
||||
} from "@/api/system_store_storage.js"
|
||||
|
||||
const test2 = () => {
|
||||
console.log("点解")
|
||||
uni.navigateTo({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
}
|
||||
const show = ref(false)
|
||||
const dates=ref(timeFrom(new Date()))
|
||||
const where = ref({
|
||||
store_name: '',
|
||||
page_no: 1,
|
||||
start_time: timeFrom(new Date()),
|
||||
end_time: timeFrom(new Date())
|
||||
start_time: dates.value,
|
||||
end_time: dates.value
|
||||
})
|
||||
const calendarShow = ref(false)
|
||||
const formData = ref({
|
||||
|
@ -114,9 +104,9 @@
|
|||
'total_price': ''
|
||||
})
|
||||
const calendarConfirm = (e) => {
|
||||
where.value.start_time = e[0];
|
||||
where.value.end_time = e[0];
|
||||
goodsList1.value=[]
|
||||
where.value.start_time = e;
|
||||
where.value.end_time = e;
|
||||
goodsList1.value = []
|
||||
getGoodsList()
|
||||
calendarShow.value = false
|
||||
}
|
||||
|
@ -158,7 +148,7 @@
|
|||
|
||||
const searchKeyword = () => {
|
||||
where.value.store_name = keyword.value;
|
||||
goodsList1.value=[]
|
||||
goodsList1.value = []
|
||||
getGoodsList();
|
||||
}
|
||||
const scrolltolower = () => {
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
<view style="background-color: #ffffff;">
|
||||
<up-sticky offset-top="0" style="background-color: #ffffff;">
|
||||
<view class="navbar">
|
||||
<view style="width: 580rpx;">
|
||||
<view style="width:35%;">
|
||||
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
||||
:showAction="false"></up-search>
|
||||
</view>
|
||||
<view class="nav-item" @click="calendarShow=true">
|
||||
<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
|
||||
|
||||
<text>筛选日期</text>
|
||||
<view style="width:65%;padding-left: 10rpx;">
|
||||
<uni-datetime-picker v-model="range" type="daterange" @change="calendarConfirm" />
|
||||
</view>
|
||||
</view>
|
||||
</up-sticky>
|
||||
|
@ -50,8 +48,6 @@
|
|||
</up-transition>
|
||||
</view>
|
||||
</view>
|
||||
<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
|
||||
:closeOnClickOverlay="true" :min-date="min_date" monthNum="13" mode="range"></up-calendar>
|
||||
|
||||
</template>
|
||||
|
||||
|
@ -87,7 +83,7 @@
|
|||
|
||||
const calendarConfirm = (e) => {
|
||||
where.value.start_time = e[0];
|
||||
where.value.end_time = e[(e.length)-1];
|
||||
where.value.end_time = e[1];
|
||||
goodsList1.value = []
|
||||
getGoodsList()
|
||||
calendarShow.value = false
|
||||
|
|
|
@ -2,14 +2,12 @@
|
|||
<view style="background-color: #ffffff;">
|
||||
<up-sticky offset-top="0" style="background-color: #ffffff;">
|
||||
<view class="navbar">
|
||||
<view style="width: 580rpx;">
|
||||
<view style="width:55%;">
|
||||
<up-search placeholder="请输入商品" @search="searchKeyword" @clear="searchKeyword" v-model="keyword"
|
||||
:showAction="false"></up-search>
|
||||
</view>
|
||||
<view class="nav-item" @click="calendarShow=true">
|
||||
<up-icon name="calendar" color="#2979ff" size="28"></up-icon>
|
||||
|
||||
<text>筛选日期</text>
|
||||
<view style="width:45%;padding-left: 10rpx;">
|
||||
<uni-datetime-picker v-model="range" type="date" @change="calendarConfirm" />
|
||||
</view>
|
||||
</view>
|
||||
</up-sticky>
|
||||
|
@ -50,9 +48,6 @@
|
|||
</up-transition>
|
||||
</view>
|
||||
</view>
|
||||
<up-calendar :show="calendarShow" @confirm="calendarConfirm" @close="calendarShow=false"
|
||||
:closeOnClickOverlay="true" :min-date="min_date" monthNum="13"></up-calendar>
|
||||
|
||||
</template>
|
||||
|
||||
|
||||
|
@ -86,8 +81,8 @@
|
|||
const calendarShow = ref(false)
|
||||
|
||||
const calendarConfirm = (e) => {
|
||||
where.value.start_time = e[0];
|
||||
where.value.end_time = e[0];
|
||||
where.value.start_time = e;
|
||||
where.value.end_time = e;
|
||||
goodsList1.value = []
|
||||
getGoodsList()
|
||||
calendarShow.value = false
|
||||
|
|
|
@ -2,18 +2,36 @@
|
|||
<view style="background-color: #fff;">
|
||||
<up-row customStyle="margin-bottom: 10px;">
|
||||
<up-col span="6">
|
||||
<view style="padding: 40rpx;">
|
||||
<view style="padding: 30rpx 40rpx 0 40rpx;">
|
||||
<up-count-to :startVal="30" :endVal="500.03" fontSize="40" decimals="2"></up-count-to>
|
||||
<view style="padding: 20rpx;">累计铺货金额</view>
|
||||
</view>
|
||||
</up-col>
|
||||
<up-col span="6">
|
||||
<view style="padding: 40rpx;">
|
||||
<view style="padding: 30rpx 40rpx 0 40rpx;">
|
||||
<up-count-to :startVal="30" :endVal="500.03" fontSize="40" decimals="2"></up-count-to>
|
||||
<view style="padding: 20rpx;">累计销售金额</view>
|
||||
</view>
|
||||
</up-col>
|
||||
</up-row>
|
||||
<up-row customStyle="margin-bottom: 10px;">
|
||||
<up-col span="6">
|
||||
<view style="padding: 30rpx 40rpx 0 40rpx;">
|
||||
<up-count-to :startVal="30" :endVal="500.03" fontSize="40" decimals="2"></up-count-to>
|
||||
<view style="padding: 20rpx;">总支出</view>
|
||||
</view>
|
||||
</up-col>
|
||||
<up-col span="6">
|
||||
<view style="padding: 30rpx 40rpx 0 40rpx;">
|
||||
<up-count-to :startVal="30" :endVal="500.03" fontSize="40" decimals="2"></up-count-to>
|
||||
<view style="padding: 20rpx;">利润</view>
|
||||
</view>
|
||||
</up-col>
|
||||
</up-row>
|
||||
<view>
|
||||
<span style="font-size: 20px;padding: 10rpx;">支出明细</span>
|
||||
<up-divider></up-divider>
|
||||
</view>
|
||||
<qiun-data-charts type="column" :opts="opts" :chartData="chartData" />
|
||||
</view>
|
||||
</template>
|
||||
|
@ -62,9 +80,17 @@
|
|||
data: [18]
|
||||
},
|
||||
{
|
||||
name: "佣金",
|
||||
data: [18]
|
||||
}
|
||||
name: "村长",
|
||||
data: [8]
|
||||
},
|
||||
{
|
||||
name: "队长",
|
||||
data: [16]
|
||||
},
|
||||
{
|
||||
name: "厨师",
|
||||
data: [18]
|
||||
}
|
||||
]
|
||||
})
|
||||
</script>
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
## 2.2.35(2024-09-21)
|
||||
- 修复 没有选中日期时点击确定直接报错的Bug [详情](https://ask.dcloud.net.cn/question/198168)
|
||||
## 2.2.34(2024-04-24)
|
||||
- 新增 日期点击事件,在点击日期时会触发该事件。
|
||||
## 2.2.33(2024-04-15)
|
||||
|
|
|
@ -698,11 +698,11 @@
|
|||
startString = getDateTime(this.start, this.hideSecond)
|
||||
}
|
||||
[startDate, startTime] = startString.split(' ')
|
||||
if (this.start && !dateCompare(this.start, this.tempRange.startDate)) {
|
||||
if (this.start && !dateCompare(this.start, `${this.tempRange.startDate} ${this.tempRange.startTime}`)) {
|
||||
startDateLaterRangeStartDate = true
|
||||
this.tempRange.startDate = startDate
|
||||
}
|
||||
if (this.start && !dateCompare(this.start, this.tempRange.endDate)) {
|
||||
if (this.start && !dateCompare(this.start, `${this.tempRange.endDate} ${this.tempRange.endTime}`)) {
|
||||
startDateLaterRangeEndDate = true
|
||||
this.tempRange.endDate = startDate
|
||||
}
|
||||
|
@ -717,11 +717,11 @@
|
|||
}
|
||||
[endDate, endTime] = endString.split(' ')
|
||||
|
||||
if (this.end && !dateCompare(this.tempRange.startDate, this.end)) {
|
||||
if (this.end && !dateCompare(`${this.tempRange.startDate} ${this.tempRange.startTime}`, this.end)) {
|
||||
endDateEarlierRangeStartDate = true
|
||||
this.tempRange.startDate = endDate
|
||||
}
|
||||
if (this.end && !dateCompare(this.tempRange.endDate, this.end)) {
|
||||
if (this.end && !dateCompare(`${this.tempRange.endDate} ${this.tempRange.endTime}`, this.end)) {
|
||||
endDateEarlierRangeEndDate = true
|
||||
this.tempRange.endDate = endDate
|
||||
}
|
||||
|
|
|
@ -182,8 +182,8 @@ class Calendar {
|
|||
if (!date) {
|
||||
date = new Date()
|
||||
}
|
||||
|
||||
return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
|
||||
const res = this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
|
||||
return res ? res : this.getDateObj(date)
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"id": "uni-datetime-picker",
|
||||
"displayName": "uni-datetime-picker 日期选择器",
|
||||
"version": "2.2.34",
|
||||
"version": "2.2.35",
|
||||
"description": "uni-datetime-picker 日期时间选择器,支持日历,支持范围选择",
|
||||
"keywords": [
|
||||
"uni-datetime-picker",
|
||||
|
|
Loading…
Reference in New Issue