mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单以及供销等界面修改

Browse Source
This commit is contained in:
jia 2023-09-26 20:32:23 +08:00
parent 55b4c78c1e
commit 8f836f3a4c
10 changed files with 846 additions and 918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/orderGoods/index.vue
View File

@ -2,7 +2,7 @@
<view class="orderGoods" :style="viewColor">
<view class='goodWrapper' :class="'item'+orderData.order_type">
<view v-if="orderData.order_type == 1" class="title acea-row row-between-wrapper">
<view class="item-status" :class="'status'+evaluate">{{evaluate == 0 ? '待核销' : '已核销'}}</view>
<view class="item-status" :class="'status'+evaluate">{{evaluate == 7 ? '待核销' : '已核销'}}</view>
<view v-if="evaluate != 0 && orderData.verify_time" class="item-date">{{orderData.verify_time}}</view>
</view>
<view v-for="(item,index) in cartInfo" :key="index">

5
pages/admin/orderDetail/index.vue
View File

@ -376,8 +376,11 @@
/*核销订单*/
goCancellation() {
let that = this;
// uni.navigateTo({
// url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
// })
uni.navigateTo({
url: '/pages/admin/cancellate_result/index?mer_id='+that.mer_id+'&code='+that.orderInfo.verify_code,
url: `/pages/admin/order_cancellation/index?mer_id=${that.mer_id}`
})
// uni.showModal({
// title: '订单核销',

1
pages/admin/orderList/index.vue
View File

@ -553,6 +553,7 @@
uni.navigateTo({
url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
})
},
toRefundDetail(item) {
uni.navigateTo({

339
pages/gather/gather.vue
View File

@ -1,58 +1,38 @@
<template>
<view class="gather">
<view v-if="isFshow">
<view
class="site-box flex_a_c_j_sb"
:style="{ opacity: backColor }"
@click="selectLocation"
>
<view
:class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']"
@click="selectLocation"
>
<view
:class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']"
style="margin-left: 20rpx"
>
<view class="site-box flex_a_c_j_sb" :style="{ 'opacity': backColor,}" @click="selectLocation">
<view :class="['place_wrapper', 'flex_a_c', isFshow ? 'sitebox' : '']" @click="selectLocation">
<view :class="['iconfont', 'icon-weizhi', isFshow ? 'sitebox' : '']" style=" margin-left: 20rpx">
</view>
<view class="town_name">{{ street }}</view>
</view>
<navigator
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view
:class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"
></view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']"></view>
</navigator>
</view>
</view>
<view class="" v-if="!isFshow">
<view class="site-box1 flex_a_c_j_sb">
<view class="place_wrapper flex_a_c" @click="selectLocation">
<view class="iconfont icon-weizhi"></view>
<view class="town_name">{{ street }}</view>
<view class="town_name">{{street}}</view>
</view>
<navigator
url="/pages/chat/customer_list/index?type=0"
hover-class="none"
>
<view class="iconfont icon-xiaoxi" style="color: #fff"> </view>
<navigator url="/pages/chat/customer_list/index?type=0" hover-class="none">
<view class="iconfont icon-xiaoxi" style="color:#fff;"> </view>
</navigator>
</view>
</view>
<zbpSwiper
:isSelectPlace="true"
:location_Arr="locationArr"
:town="street"
></zbpSwiper>
<u-empty
:show="jurisdiction"
mode="permission"
:text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"
></u-empty>
<zbpSwiper :isSelectPlace="true" :location_Arr="locationArr" :town="street"></zbpSwiper>
<u-empty :show="jurisdiction" mode="permission" :text="emptyText"
icon="http://cdn.uviewui.com/uview/empty/permission.png"></u-empty>
<view class="business com special_work" v-if="jurisdiction == false">
<view class="title project">
<view>更多功能</view>
@ -61,36 +41,19 @@
</view>
<view class="content">
<block v-if="nowMenuList.length > 0">
<u-transition
v-for="(item, index) in nowMenuList"
:key="item.name"
show
>
<view
class="examine"
@click="
<u-transition v-for="(item, index) in nowMenuList" :key="item.name" show>
<view class="examine" @click="
editFlag ? removeMenu(item) : clickMenu(item.type, item.data)
"
>
">
<image class="icon_img" :src="item.icon" mode="aspectFit">
</image>
<u-icon
v-if="editFlag"
class="icon"
name="minus-circle-fill"
color="red"
></u-icon>
<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
<text class="text">{{ item.name }}</text>
</view>
</u-transition>
</block>
<view
v-else-if="!editFlag"
@click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa"
>
还没有应用,点我添加应用</view
>
<view v-else-if="!editFlag" @click="editFlag = true"
style="text-align: center; width: 100%; color: #aaa">还没有应用,点我添加应用</view>
</view>
</view>
<view v-if="editFlag" class="business com special_work edit_card">
@ -99,13 +62,10 @@
<view class="edit2" @click="editComfirm">完成</view>
</view>
<view class="content">
<u-transition
v-for="(item, index) in AllMenuList"
:key="item.name"
show
>
<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
<view class="examine" @click="pushMenu(item)">
<image class="icon_img" :src="item.icon" mode="aspectFit"> </image>
<image class="icon_img" :src="item.icon" mode="aspectFit">
</image>
<u-icon class="icon" name="plus-circle-fill"></u-icon>
<text class="text">{{ item.name }}</text>
</view>
@ -113,16 +73,9 @@
</view>
</view>
<u-picker
:defaultIndex="[0, 0]"
:show="showPicker"
ref="uPicker"
:columns="columnData"
@confirm="confirm"
@cancel="showPicker = false"
@change="changeHandler"
keyName="name"
></u-picker>
<u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<!-- <m-tabbar native>
<template v-slot:tabbar_index_2>
<view class="custom_style">
@ -134,48 +87,48 @@
</template>
<script>
import Cache from '@/utils/cache';
import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import Cache from '@/utils/cache';
import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
import zbpSwiper from '@/components/zbpSwiper'
import {
import zbpSwiper from '@/components/zbpSwiper'
import {
getArea,
getStreet
} from '@/api/article.js';
import {
} from '@/api/article.js';
import {
mapState,
mapGetters
} from 'vuex'
import {
} from 'vuex'
import {
getWorkArticleCount,
getSlideAPI
} from '@/api/article.js'
import {
} from '@/api/article.js'
import {
getStoreList,
getUserInfo
} from '@/api/user.js'
import {
} from '@/api/user.js'
import {
getGeocoder,
microSeachBarCode,
microEadtProduct
} from '@/api/store.js'
import {
} from '@/api/store.js'
import {
Toast
} from '@/libs/uniApi';
import {
} from '@/libs/uniApi';
import {
getDiy
} from '@/api/api.js';
// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js';
// #endif
} from '@/api/api.js';
// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js';
// #endif
export default {
export default {
components: {
mTabbar,
zbpSwiper
},
data () {
data() {
return {
locationArr: ({}),
emptyText: '暂无可用应用',
@ -193,10 +146,11 @@ export default {
// 编辑中标记
editFlag: false,
// 所有菜单的按钮
AllMenuList: [{
name: '商户平台',
icon: '/static/applet/shop_app.png',
data: "__UNI__1EE148C",
data: '/pages/moreProject/moreProject',
type: 2,
},
{
@ -210,60 +164,16 @@ export default {
icon: '/static/applet/ny.png',
data: {
id: '__UNI__9620511',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=nongye',
url: '/static/wgt/__UNI__9620511.wgt',
},
type: 3,
},
{
name: '教育咨询',
icon: '/static/applet/jy.png',
data: {
id: '__UNI__7AA205C',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=jiaoyu',
},
type: 3,
},
{
name: '法律咨询',
icon: '/static/applet/fl.png',
data: {
id: '__UNI__358D505',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=falv',
},
type: 3,
},
{
name: '情感咨询',
icon: '/static/applet/qg.png',
data: {
id: '__UNI__8080F14',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=qinggan',
},
type: 3,
},
{
name: '种植分析',
icon: '/static/applet/zz.png',
data: {
id: '__UNI__9EDFE40',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=zhongzhi',
},
type: 3,
},
{
name: '养殖分析',
icon: '/static/applet/yz.png',
data: {
id: '__UNI__EEA7DC9',
url: 'https://ceshi-worker-task.lihaink.cn/api/common/getMiniProgramInfo?name=yangzhi',
},
type: 3,
type: 1,
}
],
nowMenuList: [],
street: '',
showPicker: false,
columnData: [],
isFshow: false,
backColor: 'rgba(252, 252, 252, 0)'
};
@ -271,13 +181,13 @@ export default {
computed: {
...mapGetters(['userInfo', 'location', 'isLogin'])
},
created () { },
onLoad () {
created() {},
onLoad() {
this.Area()
this.initMenu();
},
onShow () {
onShow() {
if (this.isLogin) {
this.emptyText = '暂无可用应用'
this.jurisdiction = false
@ -289,15 +199,15 @@ export default {
},
onPullDownRefresh () {
onPullDownRefresh() {
this.getUserInfo()
uni.stopPullDownRefresh()
},
beforeDestroy () {
beforeDestroy() {
// 销毁监听事件
this.$bus.$off('value-updated')
},
mounted () {
mounted() {
if (this.street.length <= 0) {
this.appLocation()
}
@ -313,7 +223,7 @@ export default {
},
// #ifdef APP-PLUS
onPageScroll (e) {
onPageScroll(e) {
const scrollTop = e.scrollTop;
if (scrollTop <= 20) {
this.backColor = 'rgba(252, 252, 252, 0)'
@ -329,7 +239,7 @@ export default {
// #endif
methods: {
scrolling () {
scrolling() {
// 滚动条距文档顶部的距离
let scrollTop =
window.pageYOffset ||
@ -364,16 +274,17 @@ export default {
} else if (scrollTop > 100) {
this.backColor = 'rgba(252, 252, 252, 1)'
this.isFshow = true
}
},
// 初始化菜单
initMenu () {
initMenu() {
let now = uni.getStorageSync('gatherNowMenuList');
try {
let arr = JSON.parse(now);
this.nowMenuList = this.AllMenuList.filter((item) => {
return arr.find(t => t.name == item.name)?.name == item.name;
})
this.nowMenuList = JSON.parse(now);
this.AllMenuList = this.AllMenuList.filter((item) => {
return this.nowMenuList.find(t => t.name == item.name)?.name != item.name;
})
@ -381,35 +292,42 @@ export default {
this.nowMenuList = [];
}
},
clickMenu (e, data) {
this.getUniMp(e, data);
clickMenu(e, data) {
switch (e) {
case 1:
this.getUniMp(data);
break;
case 2:
this.navigator(data);
break;
}
},
// 添加菜单
pushMenu (data) {
pushMenu(data) {
this.nowMenuList.push(data);
this.AllMenuList = this.AllMenuList.filter((item) => {
return item.name != data.name;
})
},
// 移除菜单
removeMenu (data) {
removeMenu(data) {
this.AllMenuList.push(data);
this.nowMenuList = this.nowMenuList.filter((item) => {
return item.name != data.name;
})
},
// 编辑完成
editComfirm () {
editComfirm() {
this.editFlag = false;
uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
},
getUniMp (type, data) {
getUniMp(data) {
// #ifdef APP-PLUS
switch (type) {
case 1: uniMP.loadMP(data); break;
case 2: uniMP.loadMPx(data); break;
case 3: uniMP.loadMPurl(data); break;
}
console.log(data, typeof data == 'string');
if (typeof data == 'string') uniMP.loadMP(data);
else uniMP.loadMPurl(data);
// uniMP.loadMPurl(data);
// uniMP.open(data.id);
return;
// #endif
uni.showToast({
@ -417,23 +335,7 @@ export default {
title: 'H5不支持打开小程序'
})
},
changeHandler (e) {
const {
columnIndex,
value,
values,
index,
picker = this.$refs.uPicker
} = e;
if (columnIndex === 0) {
getStreet({
area_code: value[0]['code']
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
});
}
},
changeHandler (e) {
changeHandler(e) {
const {
columnIndex,
value,
@ -450,7 +352,7 @@ export default {
}
},
Area () {
Area() {
getArea({
city_code: 510500
}).then(res => {
@ -458,17 +360,17 @@ export default {
this.Street(res.data[0]['code']);
});
},
Street (code) {
Street(code) {
getStreet({
area_code: code
}).then(res => {
this.$refs.uPicker.setColumnValues(1, res.data);
});
},
selectLocation () {
selectLocation() {
this.showPicker = true
},
confirm (e) {
confirm(e) {
this.street = e.value[1].name
this.$nextTick(() => {
@ -477,7 +379,7 @@ export default {
})
this.showPicker = false
},
appLocation () {
appLocation() {
uni.getLocation({
type: 'wgs84',
timeout: '10',
@ -516,17 +418,16 @@ export default {
},
navigator (url, t) {
navigator(url, t) {
// if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息");
uni.navigateTo({
url: url
})
},
getUserInfo: function () {
getUserInfo: function() {
let that = this;
getUserInfo().then(res => {
that.userInfoData = res.data;
that.$store.commit('SET_USERINFO', res.data);
// console.log(res.data.service);
if (res.data.service == null) {
// console.log('123');
@ -543,22 +444,22 @@ export default {
});
}
}
};
};
</script>
<style lang="scss" scoped>
.gather {
.gather {
padding-bottom: 164.91rpx;
background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
position: relative;
}
}
.sitebox {
.sitebox {
animation-name: fadeIn;
animation-duration: 3s;
animation-fill-mode: forwards;
}
}
@keyframes fadeIn {
@keyframes fadeIn {
from {
opacity: 0;
}
@ -566,8 +467,9 @@ export default {
to {
opacity: 1;
}
}
.site-box1 {
}
.site-box1 {
width: 706rpx;
/* #ifdef MP || APP-PLUS */
height: 160rpx;
@ -581,6 +483,7 @@ export default {
left: 20rpx;
z-index: 999;
// 位置
.place_wrapper {
color: #fff;
@ -596,8 +499,10 @@ export default {
.iconfont {
font-size: 35.09rpx;
}
}
.site-box {
}
.site-box {
width: 100%;
/* #ifdef MP || APP-PLUS */
height: 160rpx;
@ -617,7 +522,7 @@ export default {
padding-top: 25rpx;
/* #endif */
// background-color: #e5e5e5;
background: url("@/static/images/bg2.png") no-repeat;
background: url('@/static/images/bg2.png') no-repeat;
background-size: 100% 100%;
padding-right: 20rpx;
@ -639,24 +544,24 @@ export default {
font-size: 30rpx;
font-size: 35.09rpx;
}
}
}
.top_box {
.top_box {
// padding-top: 180rpx;
background: linear-gradient(#36a2ff, #fff);
}
}
.com {
.com {
margin-left: 50%;
transform: translate(-50%);
}
}
.business {
.business {
width: 694.74rpx;
// margin-bottom: 175rpx;
}
}
.special_work {
.special_work {
// padding: 17.54rpx;
width: 694.74rpx;
margin-top: 52.63rpx;
@ -746,10 +651,10 @@ export default {
}
}
}
}
}
.edit_card {
.edit_card {
background-color: #fff;
padding-top: 28rpx;
}
}
</style>

1
pages/index/index.vue
View File

@ -129,6 +129,7 @@
getIndexData,
getDiy,
getArticleList,
cloudWarehouse,
getArticleCategoryLists
} from '@/api/api.js'
import {

40
pages/margin/margin.vue
View File

@ -25,7 +25,7 @@
</view>
<button class="btn" @click="paydecimal">缴纳</button>
</view>
<!-- <view class="tip">
<!-- <view class="tip">
<view class="title">注意事项</view>
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view>
@ -52,13 +52,13 @@
export default {
data() {
return {
mer_id:0,
mer_id: 0,
merchant_Data: {},
where:{
page:1,
limit:10
where: {
page: 1,
limit: 10
},
productList:[],
productList: [],
loadend: false,
loading: false,
loadTitle: '加载更多',
@ -67,7 +67,7 @@
onLoad(e) {
this.mer_id = e.mer_id
this.decimal()
this.list(false)
this.list(true)
},
onReachBottom() {
@ -78,7 +78,7 @@
}
},
methods: {
list(isPage){
list(isPage) {
let that = this;
if (that.loadend) return;
if (that.loading) return;
@ -135,9 +135,19 @@
orderInfo: res.data
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
success: function(res) {
this.$util.Tips({
title: '支付成功'
});
console.log('success:' + JSON.stringify(res));
setTimeout(()=>{
this.decimal()
this.list(true)
},1000)
},
fail: function(err) {
this.$util.Tips({
title: '支付失败'
});
console.log('fail:' + JSON.stringify(err));
}
});
@ -164,16 +174,18 @@
page {
background-color: #fff;
}
.content-order{
.content-order {
background: #F4F4F4;
border-radius: 21rpx 21rpx ;
border-radius: 21rpx 21rpx;
margin-top: 30rpx;
padding: 10rpx;
margin-left: 10rpx;
margin-right: 10rpx;
view{
view {
font-size: 30rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
@ -181,7 +193,8 @@
margin: 20rpx;
}
}
}
.info {
display: flex;
flex-direction: column;
@ -228,7 +241,8 @@
font-weight: 400;
color: #333333;
margin-bottom: 10rpx;
text:nth-child(1){
text:nth-child(1) {
flex-shrink: 0;
margin-right: 18rpx;
}

8
pages/moreProject/moreProject.vue
View File

@ -83,7 +83,7 @@
</image>
<text class="text">保证缴纳金</text>
</view>
<view class="examine"
<!-- <view class="examine"
@click="navigator(`/pages/commissionedSales/index/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
@ -94,7 +94,7 @@
<image class="icon_img" src="@/static/images/weituo.png" mode="aspectFill">
</image>
<text class="text">委托订单</text>
</view>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
<image class="icon_img"
@ -200,7 +200,7 @@
<text class="text">保证缴纳金</text>
</view>
<view class="examine"
<!-- <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image>
@ -223,7 +223,7 @@
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image>
<text class="text">发布管理</text>
</view>
</view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">

4
pages/product/basicSet.vue
View File

@ -135,7 +135,7 @@
<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
</view>
<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
<u-switch v-model="credit_buy" @change="change"></u-switch>
</view>
@ -149,7 +149,7 @@
<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算利率：</view>
<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
</view>
<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view>
<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
<!-- <view class="item_cell">
<view class="if_btn flex_a_c_j_sb">
<text class="sub_title">是否开启商户：</text>

12
pages/product/list/index.vue
View File

@ -47,13 +47,13 @@
<swiper-item :class="{ active: 1 == swiperCur }">
<view class="slide-navigator">
<!-- 隐藏暂时不需要 -->
<navigator class="item"
<!-- <navigator class="item"
:url="`/pages/product/addGoods/freightTemplate?mer_id=${mer_id}`"
hover-class='none'>
<image mode='widthFix' class="image" src="../static/images/product_freight.png">
</image>
<text class="text">运费模板</text>
</navigator>
</navigator> -->
<navigator class="item"
:url="`/pages/product/addGoods/mulSpecification?mer_id=${mer_id}`"
hover-class='none'>
@ -61,12 +61,12 @@
src="../static/images/product_specification.png"></image>
<text class="text">规格模板</text>
</navigator>
<navigator class="item"
<!-- <navigator class="item"
:url="`/pages/users/online_warehousing/index?mer_id=${mer_id}&product_id=${data.product_id}&unique=${data.unique}`"
hover-class='none'>
<image mode='widthFix' class="image" src="@/static/images/daoru.png"></image>
<text class="text">商品导入</text>
</navigator>
</navigator> -->
</view>
</swiper-item>
</block>
@ -125,9 +125,9 @@
</view>
<view class="operation acea-row row-between-wrapper">
<view class="acea-row row-middle">
<view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
<!-- <view class="" class="bnt" @click="Fonline(item)" style="width:150rpx">
线上入库
</view>
</view> -->
<view class="" class="bnt" @click="Fline(item)" style="width:150rpx">
线下入库
</view>

12
pages/supply_chains/supply_chains.vue
View File

@ -175,7 +175,7 @@
import {
getIndexData,
getDiy,
cloudWarehouse
} from '@/api/api.js'
import {
@ -183,8 +183,7 @@
} from '@/api/product.js';
import {
getGeocoder,
merClassifly,
getProductHot
merClassifly
} from '@/api/store.js';
import {
getArea,
@ -345,7 +344,12 @@
that.loading = true;
that.loadTitle = '';
getProductHot(that.where.page, that.where.limit).then(res => {
cloudWarehouse({
page:that.where.page,
limit:that.where.limit,
street_code:id,
category_id:0
}).then(res => {
let list = res.data.list;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;