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

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

Browse Source
This commit is contained in:
weipengfei 2023-09-11 17:05:18 +08:00
commit 398fa9e769
28 changed files with 531 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/sale.js
View File

@ -35,8 +35,22 @@ export function checkchain(id,data) {
export function finishchain(id,data) { export function finishchain(id,data) {
return request.post("community/entrust/apply/finish/"+id, data); return request.post("community/entrust/apply/finish/"+id, data);
} }
//商家申请结束委托
export function finishentrust(id,data) {
return request.post("community/entrust/finish/"+id, data);
}
//委托商品加入购物车 //委托商品加入购物车
export function addEntrustCart(data) { export function addEntrustCart(data) {
return request.post("community/entrust/addEntrustCart", data); return request.post("community/entrust/addEntrustCart", data);
} }
//获取委托商品详情
export function entrustdetail(id) {
return request.get("community/entrust/"+id);
}
//编辑委托商品详情
export function editentrust(id,data) {
return request.post("community/entrust/edit/"+id, data);
}

24
pages.json
View File

@ -1611,16 +1611,16 @@
}, },
{ {
"pagePath": "pages/plant_release/index", "pagePath": "pages/plant_release/index",
"iconPath": "static/tabbar_icon/d.png", "iconPath": "static/tabbar_icon/c.png",
"selectedIconPath": "static/tabbar_icon/d-a.png", "selectedIconPath": "static/tabbar_icon/c-a.png",
"text": "发布", "text": "发布"
"visible": false
}, },
{ {
"pagePath": "pages/supply_chains/supply_chains", "pagePath": "pages/supply_chains/supply_chains",
"iconPath": "static/tabbar_icon/c.png", "iconPath": "static/tabbar_icon/d.png",
"selectedIconPath": "static/tabbar_icon/c-a.png", "selectedIconPath": "static/tabbar_icon/d-a.png",
"text": "供应" "text": "供应"
}, },
{ {
@ -1629,16 +1629,8 @@
"selectedIconPath": "static/tabbar_icon/e-a.png", "selectedIconPath": "static/tabbar_icon/e-a.png",
"text": "我的" "text": "我的"
} }
], ]
"midButton": {
"width": "68px",
"height": "70px",
"iconWidth": "48px",
"selectedColor": "#E93323",
"pagePath": "pages/plant_release/index",
"iconPath": "static/tabbar_icon/d.png",
"text": "发布"
}

50
pages/commissionedSales/addDelegation/index.vue
View File

@ -1,12 +1,9 @@
<template> <template>
<!-- #ifdef APP || H5 --> <view class="content">
<view>
<!-- #endif -->
<form @submit="formSubmit" report-submit='true'> <form @submit="formSubmit" report-submit='true'>
<view class="release_content"> <view class="release_content">
<view class="release_item"> <view class="release_item">
<view class="release_item-one"> <view class="release_item-one">
<view class="item-one"> <view class="item-one">
@ -19,7 +16,7 @@
<view class="item-one"> <view class="item-one">
委托周期 委托周期
</view> </view>
<view class="" @click="calendar"> <view class="">
<input type="number" v-model="formData.entrust_day" /> <input type="number" v-model="formData.entrust_day" />
</view> </view>
@ -61,22 +58,15 @@
</view> </view>
</view> </view>
<button class="release_btn button" form-type="submit">发布</button> <button class="release_btn button" form-type="submit">提交</button>
</view> </view>
</form> </form>
<uni-calendar ref="calendar" :date="info.date" :insert="info.insert" :lunar="info.lunar"
:startDate="info.startDate" :endDate="info.endDate" :range="info.range" @confirm="confirm"
:showMonth="info.showMonth" @close="close" />
<!-- 提到的宝贝弹窗 --> <!-- 提到的宝贝弹窗 -->
<uni-popup ref="associated" type="bottom"> <uni-popup ref="associated" type="bottom">
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated> <associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
@ -98,20 +88,8 @@
return { return {
value1: 1, value1: 1,
value2: "", value2: "",
options1: [{ options1: [],
text: "Shenzhen1",
value: 1
}, {
text: "Shenzhen2",
value: 2
}, {
text: "Shenzhen3",
value: 3
}],
date: 1,
productList: [], productList: [],
info: { info: {
startDate: '', startDate: '',
@ -122,6 +100,14 @@
selected: [], selected: [],
showMonth: false showMonth: false
}, },
formData: {
entrust_mer_id: '',
entrust_day: 15,
is_type: "4",
product_info: [],
content: ''
},
type: ''
}; };
}, },
computed: { computed: {
@ -287,6 +273,10 @@
background: #F5F5F5; background: #F5F5F5;
} }
.content {
height: 100vh;
position: relative;
}
.release_content { .release_content {
@ -531,6 +521,10 @@
} }
.release_btn { .release_btn {
margin-top: 100rpx;
position: absolute;
bottom: 150rpx;
left: 50%;
margin-left: -347rpx;
} }
</style> </style>

27
pages/commissionedSales/delegation_details/index.vue
View File

@ -10,7 +10,9 @@
{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}} {{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
</view> </view>
<view class="top-two-two"> <view class="top-two-two">
2020-07-07 14:14:14 <!-- 2020-07-07 14:14:14
-->
{{objinfo.entrust_start_date}}
</view> </view>
</view> </view>
</view> </view>
@ -37,7 +39,7 @@
</view> </view>
<view class="content_center-two"> <view class="content_center-two" v-if="objinfo">
<view class="center-two"> <view class="center-two">
<view class="center-twoa"> <view class="center-twoa">
委托方: 委托方:
@ -99,7 +101,7 @@
<view class="center-twoa"> <view class="center-twoa">
拒绝原因: 拒绝原因:
</view> </view>
<view class="center-twob" style="text-align: left;"> <view class="center-twob" :style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
{{objinfo.entrust_finish_refusal}} {{objinfo.entrust_finish_refusal}}
</view> </view>
</view> </view>
@ -112,7 +114,7 @@
</view> </view>
<view class="content_bootm_one" v-for="(item,i) in objinfo.product_list"> <view class="content_bootm_one" v-for="(item,i) in objinfo.product_list" @click="Merchbaby(item)">
<view class="bootm_oneimg"> <view class="bootm_oneimg">
<image :src="item.image[0]" mode="aspectFit"></image> <image :src="item.image[0]" mode="aspectFit"></image>
</view> </view>
@ -161,16 +163,26 @@ type:0,
}, },
methods: { methods: {
//商品详情
list(id) { list(id) {
entrustdetail(id).then((res) => { entrustdetail(id).then((res) => {
this.objinfo = res.data this.objinfo = res.data
}) })
}, },
//商品宝贝详情
Merchbaby(item) {
uni.navigateTo({
url: `/pages/goods_details/index?id=${item.product_id}`
})
},
//提交购物车
submit(item) { submit(item) {
addEntrustCart({community_id:item.community_id}).then(res=>{ addEntrustCart({
community_id: item.community_id
}).then(res => {
if (res.status == 200) { if (res.status == 200) {
this.$util.Tips({ this.$util.Tips({
@ -195,6 +207,7 @@ type:0,
.content { .content {
position: relative; position: relative;
} }
.content_top { .content_top {
height: 151rpx; height: 151rpx;
background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%); background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
@ -370,6 +383,4 @@ type:0,
position: fixed; position: fixed;
bottom: 100rpx; bottom: 100rpx;
} }
</style> </style>

285
pages/commissionedSales/initiateDelegation/index.vue
View File

@ -6,7 +6,7 @@
<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle> <cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
</view> </view>
<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 --> <!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
<view class="content-content" v-for="(item,i) in list" :key="i" > <view class="content-content" v-for="(item,i) in orderList" :key="i">
<view class="content-one"> <view class="content-one">
<view class="content-one-img"> <view class="content-one-img">
@ -14,10 +14,10 @@
</view> </view>
<view class="content-one-txt"> <view class="content-one-txt">
<view class="one-txt-a"> <view class="one-txt-a">
{{item.content}} {{item.title}}
</view> </view>
<view class="one-txt-b"> <view class="one-txt-b">
委托周期:{{item.day}} 委托周期:{{item.entrust_day}}
</view> </view>
</view> </view>
</view> </view>
@ -28,7 +28,6 @@
<view class="content-two-edita" @click="order"> <view class="content-two-edita" @click="order">
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<!-- <view class="contentgn_a" @click="soldEdit(item)"> <!-- <view class="contentgn_a" @click="soldEdit(item)">
处理 处理
@ -47,62 +46,62 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.type==2"> <view class="content-two_oneq" v-if="item.mer_status==1">
<view class="content-two-editb" @click="accepted"> <view class="content-two-editb" @click="accepted">
已接受 已接受
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" @click="closingorder"> <view class="contentgn_a" @click="closingorder(item)" v-if="item.entrust_finish==3">
结束委托 结束委托
</view> </view>
<span v-if="item.entrust_finish==3"></span>
<view class="contentgn_b" @click="detail(item)">
详情
</view>
</view>
</view>
<view class="content-two_one" v-if="item.mer_status==2">
<view class="content-two-editc" @click="declined">
已拒绝
</view>
<view class="contentgn">
<!--<view class="contentgn_a" @click="deleteOrder(item)">
删除
</view>
<span></span> -->
<view class="contentgn_b" @click="detail(item)">
详情
</view>
</view>
</view>
<view class="content-two_one" v-if="item.type==4">
<view class="content-two-editd" @click="soldEdit">
已完成
</view>
<view class="contentgn">
<view class="contentgn_a" @click="deleteOrder(item)">
删除
</view>
<span></span> <span></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==3">
<view class="content-two-editc" @click="declined">
已拒绝
</view> </view>
<view class="contentgn"> <view class="adddelegation" @click="addDelegation">
<view class="contentgn_a"> <view class="adddelegation-one">
删除 <image src="@/static/images/delegation.png" mode=""></image>
</view> </view>
<span></span> <view class="adddelegation-two">
<view class="contentgn_b"> 新增委托
详情
</view> </view>
</view> </view>
</view> <view v-if="orderList.length == 0">
<view class="content-two_one" v-if="item.type==4">
<view class="content-two-editd" @click="soldEdit">
已完成
</view>
<view class="contentgn">
<view class="contentgn_a">
删除
</view>
<span></span>
<view class="contentgn_b">
详情
</view>
</view>
</view>
</view>
<view v-if="orderList.length == 0 && this.where.page > 1">
<emptyPage title="暂无订单~"></emptyPage> <emptyPage title="暂无订单~"></emptyPage>
</view> </view>
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<uni-popup ref="bindmobile" type="center" @click="close"> <uni-popup ref="bindmobile" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -114,19 +113,16 @@
委托申请处理 委托申请处理
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>{{obj.settle_cycle}}天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>{{obj.interest_rate}}%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation" @click="passDelete(obj)">
拒绝 拒绝
</view> </view>
<view class="determine"> <view class="determine" @click="passagree(obj)">
接受 接受
</view> </view>
</view> </view>
@ -136,7 +132,6 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile1" type="center" @click="close"> <uni-popup ref="bindmobile1" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -156,15 +151,11 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile2" type="center" @click="close"> <uni-popup ref="bindmobile2" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -175,20 +166,17 @@
<view class="bg-content-a" style="margin-left: 207rpx;"> <view class="bg-content-a" style="margin-left: 207rpx;">
结束委托申请处理 结束委托申请处理
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b" v-if="obj.mer_info">
结算周期: <span>30天</span> 结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c" v-if="obj.mer_info">
利息比例: <span>0.05%</span> 利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation" @click="refused">
拒绝 拒绝
</view> </view>
<view class="determine"> <view class="determine" @click="agree(obj)">
接受 接受
</view> </view>
</view> </view>
@ -209,24 +197,19 @@
<view class="bg-content-a" style="margin-left: 207rpx;"> <view class="bg-content-a" style="margin-left: 207rpx;">
结束委托申请处理 结束委托申请处理
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b" v-if="obj.mer_info">
结算周期: <span>30天</span> 结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
</view>
<view class="bg-content-c" v-if="obj.mer_info">
利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span>
</view>
<view class="bg-content-c">
拒绝原因： 拒绝原因：
<view class="" style="margin-top: 21rpx;"> <view class="" style="margin-top: 21rpx;">
<textarea v-model="refuseds" placeholder="输入拒绝原因" class="bg-content_textarea" />
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
</view> </view>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn" @click="agree(obj)">
<view class="determine"> <view class="determine">
接受 接受
</view> </view>
@ -242,34 +225,44 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {
entrustlist,
finishchain,
checkchain,
finishentrust
} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
emptyPage emptyPage,
}, },
data() { data() {
return { return {
activeItem: "tabOne", activeItem: "tabOne",
status: 'loadmore',
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
where: { where: {
page: 1, page: 1,
limit: 10 limit: 10,
type: 1,
status: 0
}, },
tabs: [{ tabs: [{
name: "tabOne", name: "tabOne",
label: '待处理', label: '待处理',
type: '1' type: 0
}, },
{ {
name: "tabTwo", name: "tabTwo",
label: '已接受', label: '已接受',
type: '2' type: 1
}, },
{ {
name: "tabThree", name: "tabThree",
label: '已拒绝', label: '已拒绝',
type: '3' type: 2
}, },
], ],
@ -297,24 +290,44 @@
type: 4 type: 4
} }
] ],
obj: {},
refuseds: ''
} }
}, },
onLoad() { onLoad() {
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
console.log(this.tabs[0]) // console.log(this.tabs[0])
}, },
mounted() { mounted() {
this.commislist()
}, },
methods: { methods: {
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.commislist()
},
nav(item) { nav(item) {
// uni.navigateTo({ // uni.navigateTo({
// url: '/pages/commissionedSales/delegation_details/index' // url: '/pages/commissionedSales/delegation_details/index'
// }) // })
}, },
//获取分类数据
commislist() {
entrustlist(this.where).then((res) => {
this.orderList.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
})
},
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
@ -337,7 +350,6 @@
}, },
//管理弹窗 //管理弹窗
close() { close() {
console.log('1111111')
this.$refs.bindmobile.close() this.$refs.bindmobile.close()
this.$refs.bindmobile1.close() this.$refs.bindmobile1.close()
this.$refs.bindmobile2.close() this.$refs.bindmobile2.close()
@ -366,28 +378,54 @@
}) })
}, },
// 待处理 // 待处理
soldEdit() { soldEdit(item) {
this.obj = item
console.log(item)
this.$refs.bindmobile.open() this.$refs.bindmobile.open()
}, },
//已接受 //已接受
accepted() { accepted() {
this.$refs.bindmobile1.open()
}, },
//结束委托 //结束委托
closingorder() { closingorder(item) {
console.log(item)
this.obj = item
this.$refs.bindmobile2.open()
// this.$refs.bindmobile3.open()
},
//拒绝申请委托
refused() {
this.$refs.bindmobile2.close()
setTimeout(() => {
this.$refs.bindmobile3.open() this.$refs.bindmobile3.open()
}, 1000)
}, },
// 已拒绝 // 已拒绝
declined() { declined() {
this.$refs.bindmobile2.open() // this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
},
agree(item) {
finishentrust(item.community_id, {
status: 2,
refusal: this.refuseds
}).then(res => {
this.$util.Tips({
title: res.message,
icon: 'success'
})
this.orderList = []
this.tabTitle = "tabTwo"
this.$refs.bindmobile2.close()
this.$refs.bindmobile3.close()
this.commislist()
})
}, },
//删除订单 //删除订单
deleteOrder(item) { deleteOrder(item) {
checkchain(item.community_id, { checkchain(item.community_id, {
status: 3 status: 3
}).then(res => { }).then(res => {
@ -398,6 +436,12 @@
this.orderList = [] this.orderList = []
this.tabTitle = "tabOne" this.tabTitle = "tabOne"
this.commislist() this.commislist()
}).catch((err) => {
console.log(err)
this.$util.Tips({
title: err,
icon: 'error'
})
}) })
}, },
// 审核未通过 编辑 // 审核未通过 编辑
@ -438,10 +482,56 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content {
height: 100vh;
position: relative;
}
.content_top { .content_top {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.adddelegation {
width: 694rpx;
height: 95rpx;
background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
border-radius: 47rpx 47rpx 47rpx 47rpx;
opacity: 1;
display: flex;
position: fixed;
position: absolute;
bottom: 84rpx;
left: 50%;
margin-left: -347rpx;
.adddelegation-one {
width: 50rpx;
margin-right: 30rpx;
height: 50rpx;
margin-left: 242rpx;
margin-top: 21rpx;
image {
width: 50rpx;
height: 50rpx;
}
}
.adddelegation-two {
font-size: 32rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
color: #FFFFFF;
margin-top: 25rpx;
}
}
.content_top { .content_top {
@ -637,12 +727,11 @@
} }
span { span {
width: 0px; width: 1px;
height: 30rpx; height: 30rpx;
opacity: 1; opacity: 1;
margin-top: 8rpx;
margin-top: 10rpx; background-color: #cccccc;
border: 2rpx solid #CCCCCC;
} }
@ -823,7 +912,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 404rpx; top: 304rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -869,7 +958,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 152rpx; height: 242rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;

112
pages/commissionedSales/receivedCommission/index.vue
View File

@ -14,11 +14,15 @@
</view> </view>
<view class="content-one-txt"> <view class="content-one-txt">
<view class="one-txt-a"> <view class="one-txt-a">
{{item.content}} {{item.title}}
</view> </view>
<view class="one-txt-b"> <view class="one-txt-b">
委托周期:{{item.entrust_day}} 委托周期:{{item.entrust_day}}
</view> </view>
<view class="one-txt-b" v-if="item.mer_status==1" style="color: red;margin-top: 3rpx;">
{{item.entrust_finish==0?'未申请结束委托':""||item.entrust_finish==1?'委托已结束':""||item.entrust_finish==2?'商家拒绝结束委托':""||item.entrust_finish==3?'结束委托申请中':""}}
</view>
</view> </view>
</view> </view>
@ -27,7 +31,7 @@
待处理 待处理
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a"> <view class="contentgn_a" @click="soldEdit(item)">
处理 处理
</view> </view>
<span></span> <span></span>
@ -44,17 +48,14 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_oneq" v-if="item.type==2"> <view class="content-two_oneq" v-if="item.mer_status==1">
<view class="content-two-editb" @click="accepted"> <view class="content-two-editb" @click="accepted">
已接受 已接受
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a" style="margin-left: 10rpx;" <view class="contentgn_a" style="margin-left: 10rpx;"
v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)"> v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
结束委托 申请结束委托
</view> </view>
<span v-if="item.entrust_order_id>0&&item.mer_status==1"></span> <span v-if="item.entrust_order_id>0&&item.mer_status==1"></span>
<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;" <view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
@ -63,33 +64,26 @@
</view> </view>
<span v-if="item.entrust_order_id==0"></span> <span v-if="item.entrust_order_id==0"></span>
<view class="contentgn_b" @click="detail(item)"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==3"> <view class="content-two_one" v-if="item.mer_status==2">
<view class="content-two-editc" @click="declined"> <view class="content-two-editc" @click="declined">
已拒绝 已拒绝
</view> </view>
<view class="contentgn"> <view class="contentgn">
<view class="contentgn_a"> <!-- <view class="contentgn_a" click="deleteOrder(item)">
删除 删除
</view> </view>
<span></span> <span></span> -->
<view class="contentgn_b"> <view class="contentgn_b" @click="detail(item)">
详情 详情
</view> </view>
</view> </view>
</view> </view>
<view class="content-two_one" v-if="item.type==4"> <view class="content-two_one" v-if="item.type==4">
<view class="content-two-editd" @click="soldEdit"> <view class="content-two-editd" @click="soldEdit">
已完成 已完成
</view> </view>
@ -109,31 +103,27 @@
<u-loadmore :status="status" v-if="orderList.length >= where.limit" /> <u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<u-loadmore :status="status" v-if="orderList.length >= where.limit" /> <u-loadmore :status="status" v-if="orderList.length >= where.limit" />
<uni-popup ref="bindmobile" type="center" @click="close"> <uni-popup ref="bindmobile" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
<image src="@/static/images/wt_close.png" mode=""></image> <image src="@/static/images/wt_close.png" mode=""></image>
</view> </view>
<view class="entrust_bg"> <view class="entrust_bg">
<view class="entrust_bg-content"> <view class="entrust_bg-content" v-if="obj.mer_info">
<view class="bg-content-a"> <view class="bg-content-a">
委托申请处理 委托申请处理
</view> </view>
<view class="bg-content-b" > <view class="bg-content-b" >
结算周期: <span>30天</span> 结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
</view> </view>
<view class="bg-content-c" > <view class="bg-content-c" >
利息比例: <span>0.05%</span> 利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation" @click="passDelete(obj)">
拒绝 拒绝
</view> </view>
<view class="determine"> <view class="determine" @click="passagree(obj)">
接受 接受
</view> </view>
</view> </view>
@ -143,7 +133,6 @@
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile1" type="center" @click="close"> <uni-popup ref="bindmobile1" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -164,15 +153,11 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<uni-popup ref="bindmobile2" type="center" @click="close"> <uni-popup ref="bindmobile2" type="center" @click="close">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<view class="entrust"> <view class="entrust">
<view class="entrust_close" @click="close"> <view class="entrust_close" @click="close">
@ -185,13 +170,10 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="cancellation"> <view class="cancellation">
拒绝 拒绝
@ -219,20 +201,15 @@
</view> </view>
<view class="bg-content-b"> <view class="bg-content-b">
结算周期: <span>30天</span> 结算周期: <span>30天</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
利息比例: <span>0.05%</span> 利息比例: <span>0.05%</span>
</view> </view>
<view class="bg-content-c"> <view class="bg-content-c">
拒绝原因： 拒绝原因：
<view class="" style="margin-top: 21rpx;"> <view class="" style="margin-top: 21rpx;">
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" /> <textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
</view> </view>
</view> </view>
<view class="entrust_bga_btn"> <view class="entrust_bga_btn">
<view class="determine"> <view class="determine">
@ -250,7 +227,11 @@
<script> <script>
import cxNavTitle from '@/components/cx-navTitle.vue' import cxNavTitle from '@/components/cx-navTitle.vue'
import emptyPage from '@/components/emptyPage.vue'; import emptyPage from '@/components/emptyPage.vue';
import {} from '@/api/sale.js' import {
entrustlist,
finishchain,
checkchain
} from '@/api/sale.js'
export default { export default {
components: { components: {
cxNavTitle, cxNavTitle,
@ -321,14 +302,32 @@
}, },
mounted() { mounted() {
this.commislist()
}, },
methods: { methods: {
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
this.where.page = ++this.where.page;
this.commislist()
},
nav(item) { nav(item) {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/commissionedSales/delegation_details/index' // url: '/pages/commissionedSales/delegation_details/index'
// })
},
//获取分类数据
commislist() {
entrustlist(this.where).then((res) => {
this.orderList.push(...res.data.list)
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
}) })
}, },
//选择
tabClick(e) { //点击获取当前标签数据 tabClick(e) { //点击获取当前标签数据
this.activeItem = e.name; //当前class类名 this.activeItem = e.name; //当前class类名
this.tabTitle = e.name; //当前选的标签名 this.tabTitle = e.name; //当前选的标签名
@ -339,7 +338,6 @@
}, },
//管理弹窗 //管理弹窗
close() { close() {
console.log('1111111')
this.$refs.bindmobile.close() this.$refs.bindmobile.close()
this.$refs.bindmobile1.close() this.$refs.bindmobile1.close()
this.$refs.bindmobile2.close() this.$refs.bindmobile2.close()
@ -356,14 +354,10 @@
this.obj = item this.obj = item
this.$refs.bindmobile.open() this.$refs.bindmobile.open()
}, },
//已接受 //已接受
accepted() { accepted() {
this.$refs.bindmobile1.open()
}, },
//结束委托 //结束委托
closingorder(item) { closingorder(item) {
@ -377,12 +371,13 @@
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1' url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
}) })
}, },
//结束委托申请 //申请结束委托申请
deteragrss(item) { deteragrss(item) {
console.log(item)
finishchain(item.community_id, { finishchain(item.community_id, {
status: 1 status: 1
}).then((res) => { }).then((res) => {
console.log(res)
this.$util.Tips({ this.$util.Tips({
title: res.message, title: res.message,
icon: 'success' icon: 'success'
@ -390,9 +385,9 @@
this.orderList = [] this.orderList = []
this.tabTitle = "tabTwo" this.tabTitle = "tabTwo"
this.commislist() this.commislist()
this.$refs.bindmobile1.colse() this.$refs.bindmobile1.close()
}).catch((err) => { }).catch((err) => {
this.$refs.bindmobile1.close()
this.$util.Tips({ this.$util.Tips({
title: err, title: err,
icon: 'error' icon: 'error'
@ -401,7 +396,8 @@
}, },
// 已拒绝 // 已拒绝
declined() { declined() {
this.$refs.bindmobile2.open() // this.$refs.bindmobile2.open()
this.$refs.bindmobile3.open()
}, },
//删除订单 //删除订单
deleteOrder(item) { deleteOrder(item) {
@ -433,7 +429,7 @@
this.orderList = [] this.orderList = []
this.tabTitle = "tabOne" this.tabTitle = "tabOne"
this.commislist() this.commislist()
this.$refs.bindmobile1.colse() this.$refs.bindmobile.close()
}) })
}, },
//审核通过 同意 //审核通过 同意
@ -838,7 +834,7 @@
.entrust_bg-content { .entrust_bg-content {
position: absolute; position: absolute;
top: 404rpx; top: 304rpx;
.bg-content-a { .bg-content-a {
margin-left: 242rpx; margin-left: 242rpx;
@ -884,7 +880,7 @@
.bg-content_textarea { .bg-content_textarea {
width: 624rpx; width: 624rpx;
height: 152rpx; height: 242rpx;
padding: 25rpx 18rpx; padding: 25rpx 18rpx;
background: #F5F5F5; background: #F5F5F5;

9
pages/index/index.vue
View File

@ -157,16 +157,7 @@
} }
}, },
onShow() { onShow() {
uni.startLocationUpdate({
success: res => {
console.log('开启接收位置消息成功')
},
fail: err => {
this.selfLocation()
},
complete: msg => console.log('调用开启接收位置消息 API 完成')
});
//监听网络状态变化 //监听网络状态变化
uni.onNetworkStatusChange((res) => { uni.onNetworkStatusChange((res) => {

67
pages/nongKe/cloud_entrepot/index.vue
View File

@ -16,7 +16,6 @@
</view> </view>
</view> --> </view> -->
<view class="" v-if="cloudList.length>0"> <view class="" v-if="cloudList.length>0">
<view class=""> <view class="">
<!-- <view style="height: var(--status-bar-height);"></view> --> <!-- <view style="height: var(--status-bar-height);"></view> -->
@ -26,7 +25,7 @@
<u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx" <u--image :showLoading="true" src="/static/images/LHYC/FH.png" width="50.82rpx"
height="50.82rpx" @click='goBack'></u--image> height="50.82rpx" @click='goBack'></u--image>
<view class="head_tit"> <view class="head_tit">
通滩镇里海云仓 {{town}}里海云仓
</view> </view>
</view> </view>
<view class="head_r" @click="showPop=true"> <view class="head_r" @click="showPop=true">
@ -98,18 +97,16 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
</view> </view>
<transition name="fade">
<view class="content">
<view class="content_sift" :style="{position:pocls,top:headtop+'px'}" v-if="!showtit"> <view class="content_sift" :style="{position:pocls,top:headtop+'px'}" v-if="!showtit">
<view :class="{act:item.act}" v-for="item,index in actList" :key="index" <view :class="{act:item.act}" v-for="item,index in actList" :key="index"
@click="screenGoods(item.screen,index)"> @click="screenGoods(item.screen,index)">
{{item.tit}} {{item.tit}}
</view> </view>
</view> </view>
<transition name="fade">
<view class="content">
<view class="goods_list" v-if="goodsList.length>0"> <view class="goods_list" v-if="goodsList.length>0">
<!-- <view style="background-color: white;height: 100rpx;" v-if="!showtit">
</view> -->
<view class="empty" v-if='showLoading'> <view class="empty" v-if='showLoading'>
<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon> <u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
</view> </view>
@ -149,7 +146,7 @@
</view> </view>
</view> </view>
<view style="height: 100rpx;"> <view style="height: 100rpx;">
<!-- <u-loadmore :status="status" /> -->
</view> </view>
</view> </view>
@ -162,7 +159,7 @@
</view> </view>
</view> </view>
<view class="card"> <view class="card" :style="`bottom:${appInfo.bottom}px`">
<view class="left"> <view class="left">
<view class="" style="position: relative;"> <view class="" style="position: relative;">
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx" <u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
@ -227,8 +224,12 @@
height="400.09rpx"></u--image> height="400.09rpx"></u--image>
</view> </view>
</view>
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
</view> </view>
</view> </view>
@ -259,6 +260,7 @@
data() { data() {
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13'; let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
return { return {
appInfo: {},
pocls: "", pocls: "",
type: "", type: "",
act_swiper: "", act_swiper: "",
@ -279,6 +281,7 @@
cartList: [], cartList: [],
activeClass: 'activeClass', activeClass: 'activeClass',
headtop: "", headtop: "",
page_num: 1,
actList: [{ actList: [{
tit: '综合', tit: '综合',
act: "", act: "",
@ -292,14 +295,9 @@
act: "", act: "",
screen: "price_asc" screen: "price_asc"
}], }],
list3: [ status: "loadmore",
'/static/images/LHYC/BG.png', flag: false,
'/static/images/LHYC/WYLVYC.png',
'/static/images/LHYC/NFCPYC.png',
'/static/images/LHYC/BG.png',
'/static/images/LHYC/NFCPYC.png',
'/static/images/LHYC/NFCPYC.png',
],
} }
}, },
onLoad(e) { onLoad(e) {
@ -307,15 +305,31 @@
uni.getSystemInfo({ uni.getSystemInfo({
success: (res) => { success: (res) => {
this.winHeight = res.windowHeight this.winHeight = res.windowHeight
this.appInfo = res.safeAreaInsets
}, },
}); });
this.street_code = e.street this.street_code = e.street
this.town = e.town this.town = e.town
this.getCloundShop() this.getCloundShop()
}, },
onShow() { // 分页
// onReachBottom() {
// if (this.flag) return
// this.status = "loading"
// this.page_num += 1
// this.flag = true
// this.getList().then(res => {
// return
// this.goodsList = this.goodsList.concat(res.data.data)
// this.flag = false
// if (!res.data.data.length) {
// this.status = "nomore"
// this.flag = true
// }
// })
// },
},
onPageScroll(e) { onPageScroll(e) {
let that = this let that = this
this.showtit = !Boolean(e.scrollTop) this.showtit = !Boolean(e.scrollTop)
@ -323,6 +337,7 @@
.in(this) .in(this)
.select('.content') .select('.content')
.boundingClientRect(rect => { .boundingClientRect(rect => {
// console.log(rect)
if (rect.top <= this.headtop) { if (rect.top <= this.headtop) {
this.pocls = 'fixed' this.pocls = 'fixed'
this.act_swiper = 'act_swiper' this.act_swiper = 'act_swiper'
@ -355,7 +370,6 @@
methods: { methods: {
cartFn() { cartFn() {
getCartList().then(res => { getCartList().then(res => {
this.cartList = res.data.list this.cartList = res.data.list
this.cartList[0].list.forEach(e => { this.cartList[0].list.forEach(e => {
this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
@ -419,7 +433,9 @@
street_code: this.street_code, street_code: this.street_code,
category_id: this.cloudList[this.current].category_id, category_id: this.cloudList[this.current].category_id,
order: this.type, order: this.type,
keyword: this.keyword keyword: this.keyword,
// page_num: this.page_num
}).then(res => { }).then(res => {
this.goodsList = res.data.list this.goodsList = res.data.list
this.showLoading = false this.showLoading = false
@ -630,7 +646,8 @@
} }
.goods_list { .goods_list {
min-height: 100vh;
// background-color: red;
.goods { .goods {
display: flex; display: flex;
@ -705,7 +722,7 @@
// } // }
.content_sift { .content_sift {
width: 730rpx; width: 750rpx;
padding: 22rpx 0; padding: 22rpx 0;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
@ -727,7 +744,7 @@
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
position: fixed; position: fixed;
bottom: 0; // bottom: 0;
background-color: #333333; background-color: #333333;
height: 101.64rpx; height: 101.64rpx;
border-radius: 50.82rpx; border-radius: 50.82rpx;
@ -861,7 +878,7 @@
// align-items: center; // align-items: center;
// padding: 20vh 0; // padding: 20vh 0;
position: relative; position: relative;
height: 85vh; height: 100vh;
.info { .info {
position: absolute; position: absolute;

9
pages/order_details/index.vue
View File

@ -61,6 +61,7 @@
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view> <view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
</view> </view>
<view class='progress acea-row row-between-wrapper'> <view class='progress acea-row row-between-wrapper'>
<view <view
v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1"> v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
<view class='iconfont icon-webicon318 t-color'> <view class='iconfont icon-webicon318 t-color'>
@ -82,13 +83,17 @@
</view> </view>
<view class='iconfont' <view class='iconfont'
:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 && orderInfo.status != 9 ? "t-color":"")' :class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status > 3 && orderInfo.status != 9 ? "t-color":"")'
v-if="orderInfo.order_type == 0"></view> v-if="orderInfo.order_type == 0"></view>
<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""' <view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
v-if="orderInfo.order_type == 0"></view> v-if="orderInfo.order_type == 0"></view>
<view class='iconfont' <view class='iconfont'
:class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'> :class='(orderInfo.status == 2 && orderInfo.status != 9&& orderInfo.order_status != 8 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 && orderInfo.status != 9 ? "t-color":"")'>
</view> </view>
<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'> <view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
</view> </view>
<view class='iconfont' <view class='iconfont'
@ -336,7 +341,7 @@
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator> </navigator>
<view class="" v-if="orderInfo.activity_type==98"> <view class="" v-if="orderInfo.activity_type==98||orderInfo.activity_type==99">
<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货 <view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">确认收货
</view> </view>
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货 <view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货

11
pages/order_pay_status/index.vue
View File

@ -232,6 +232,17 @@
}) })
} }
} else if (this.product_type == 99) {
if(val==1){
uni.navigateTo({
url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}`
})
}else{
uni.navigateTo({
url: `/pages/users/order_list/relase?status=0&product_type=${this.product_type}`
})
}
} else { } else {
if(val==1){ if(val==1){
uni.navigateTo({ uni.navigateTo({

2
pages/plantGrass/plant_detail/index.vue
View File

@ -1,8 +1,10 @@
<template> <template>
<view :style="viewColor"> <view :style="viewColor">
<!-- #ifdef H5 -->
<view class="head-menu"> <view class="head-menu">
<view class='iconfont icon-xiangzuo' @click="returns"></view> <view class='iconfont icon-xiangzuo' @click="returns"></view>
</view> </view>
<!-- #endif -->
<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false"> <view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
<view v-if="followDetail.status != 1" class="approval_status"> <view v-if="followDetail.status != 1" class="approval_status">
<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'"> <view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">

2
pages/product/basicSet.vue
View File

@ -273,7 +273,7 @@
}, },
onLoad(e) { onLoad(e) {
this.id = e.mer_id this.id = e.mer_id
// this.getMerchantInfo(e.mer_id) this.getMerchantInfo(e.mer_id)
this.isZiti = true this.isZiti = true
this.isKuaidi = true this.isKuaidi = true

107
pages/supply_chains/supply_chains.vue
View File

@ -14,7 +14,11 @@
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view> <view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
</navigator> </navigator>
</view> </view>
</view> </view>
<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr" <zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
@change="dchange"> @change="dchange">
</zbpSwiper> </zbpSwiper>
@ -70,8 +74,6 @@
</view> </view>
<view class="list-con"> <view class="list-con">
<!-- <view class="list-con-left"
@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')"> -->
<view class="list-con-left" <view class="list-con-left"
@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')"> @tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
@ -85,8 +87,6 @@
<image src="@/static/images/f5.png" mode="aspectFit"></image> <image src="@/static/images/f5.png" mode="aspectFit"></image>
</view> </view>
<view class="list-con-right"> <view class="list-con-right">
<!-- <view class="con-right" style="margin-bottom: 20rpx"
@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')"> -->
<view class="con-right" style="margin-bottom: 20rpx" <view class="con-right" style="margin-bottom: 20rpx"
@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')"> @click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
@ -99,8 +99,6 @@
</view> --> </view> -->
<image src="@/static/images/f7.png" mode="aspectFit"></image> <image src="@/static/images/f7.png" mode="aspectFit"></image>
</view> </view>
<!-- <view class="con-right"
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> -->
<view class="con-right" <view class="con-right"
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> @click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
<!-- <view class="list-con-title"> <!-- <view class="list-con-title">
@ -119,7 +117,10 @@
<image src="@/static/images/f4.png" mode="aspectFit"></image> <image src="@/static/images/f4.png" mode="aspectFit"></image>
</view> </view>
<view class="goodslist"> <view class="goodslist">
<WaterfallsFlow :wfList="cateGoods" /> <WaterfallsFlow :wfList="productList" :type="1" />
</view>
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view> </view>
<view class="empty_wrapper" v-if="emptyShow"> <view class="empty_wrapper" v-if="emptyShow">
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty> <u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
@ -128,13 +129,12 @@
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm" <u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker> @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
<view class="location" v-if="isshow"> <view class="location" v-if="isshow">
<view class="locationa"> 位置权限使用说明 </view> <view class="locationa"> 位置权限使用说明 </view>
<view class="locationb"> 用于向你推荐最近门店 </view> <view class="locationb"> 用于向你推荐最近门店 </view>
</view> </view>
<!-- <m-tabbar native>
<!-- <m-tabbar native> <!-- <m-tabbar native>
<template v-slot:tabbar_index_2> <template v-slot:tabbar_index_2>
<view class="custom_style"> <view class="custom_style">
@ -199,7 +199,7 @@
}, },
isshow: false, isshow: false,
locationArr: ({}), locationArr: ({}),
status: 'loadmore',
bgColor: '', bgColor: '',
showPicker: false, showPicker: false,
columnData: [], columnData: [],
@ -223,20 +223,23 @@
location: '', location: '',
emptyShow: false, emptyShow: false,
town: '', town: '',
cateGoods: [], productList: [],
recoList: [], recoList: [],
articleList: [], articleList: [],
street_id: '', street_id: '',
street: '', street: '',
bgColor: '', bgColor: '',
isFshow: false, isFshow: false,
backColor: 'rgba(252, 252, 252, 0)' backColor: 'rgba(252, 252, 252, 0)',
loadend: false,
loading: false,
loadTitle: '加载更多',
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.cateGoods = []
this.list() this.list(true);
this.Area() this.Area()
uni.stopPullDownRefresh() uni.stopPullDownRefresh()
}, },
@ -263,11 +266,15 @@
}, },
onReachBottom() { onReachBottom() {
if (this.status == 'nomore') return; if (this.productList.length > 0) {
this.status = 'loading'; setTimeout(() => {
this.where.page = ++this.where.page; this.list(false);
}, 500)
} else {
this.list() this.list()
}
}, },
beforeDestroy() { beforeDestroy() {
// 销毁监听事件 // 销毁监听事件
@ -322,17 +329,59 @@
}, },
//获取商品列表 //获取商品列表
list(id) { list(isPage,id) {
if (id) { if (id) {
spuInfo(id, this.where1).then(res => {
this.cateGoods.push(...res.data.list)
}) let that = this;
if (that.loadend) return;
if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
that.loading = true;
that.loadTitle = '';
spuInfo(id,that.where).then(res => {
let list = res.data.list;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? '已全部加载' : '加载更多';
that.$set(that, 'productList', productList);
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
that.loading = false;
that.loadTitle = '加载更多';
});
} else { } else {
getProductHot(this.where.page, this.where.limit).then(res => { let that = this;
this.cateGoods.push(...res.data.list) if (that.loadend) return;
}) if (that.loading) return;
if (isPage === true) that.$set(that, 'productList', []);
that.loading = true;
that.loadTitle = '';
getProductHot(that.where.page,that.where.limit).then(res => {
let list = res.data.list;
let productList = that.$util.SplitArray(list, that.productList);
let loadend = list.length < that.where.limit;
that.loadend = loadend;
that.loading = false;
that.loadTitle = loadend ? '已全部加载' : '加载更多';
that.$set(that, 'productList', productList);
// console.log(that.productList)
that.$set(that.where, 'page', that.where.page + 1);
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
}).catch(err => {
that.loading = false;
that.loadTitle = '加载更多';
});
} }
@ -398,8 +447,8 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.cateGoods=[] this.productList=[]
this.list(this.street_id) this.list(true,this.street_id)
this.$nextTick(() => { this.$nextTick(() => {
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code); this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
@ -489,7 +538,7 @@
this.street = e.value[1].name this.street = e.value[1].name
this.street_id = e.value[1].code this.street_id = e.value[1].code
this.town = e.value[1].name this.town = e.value[1].name
this.cateGoods=[] this.productList=[]
this.list(this.street_id) this.list(this.street_id)
}, },
selfLocation() { selfLocation() {
@ -512,6 +561,7 @@
lat: latitude, lat: latitude,
long: longitude long: longitude
}).then(res => { }).then(res => {
this.isshow = false
this.town = res.data.address_reference.town.title this.town = res.data.address_reference.town.title
this.street_id = res.data.address_reference.town.id this.street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street this.street = res.data.address_component.street
@ -522,6 +572,7 @@
}) })
this.list(this.street_id) this.list(this.street_id)
}).catch(err => { }).catch(err => {
this.isshow = false
uni.showToast({ uni.showToast({
title: err, title: err,
icon: 'none' icon: 'none'

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

@ -732,7 +732,7 @@
if (status == 5) { if (status == 5) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/refund/list?type=0' url: '/pages/users/refund/list?type=98'
}) })
} else { } else {
if (status == this.orderStatus) return; if (status == this.orderStatus) return;

10
pages/users/order_list/relase.vue
View File

@ -490,7 +490,7 @@
arrlist() { arrlist() {
refundList({ refundList({
product_type: 98, product_type: 99,
type: 0, type: 0,
page: 1, page: 1,
limit: 1500 limit: 1500
@ -568,7 +568,7 @@
getOrderData: function() { getOrderData: function() {
let that = this; let that = this;
orderData({ orderData({
product_type: 98 product_type: 99
}).then(res => { }).then(res => {
// console.log(res.data) // console.log(res.data)
that.$set(that, 'orderData', res.data); that.$set(that, 'orderData', res.data);
@ -729,7 +729,7 @@
if (status == 5) { if (status == 5) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/refund/list?type=0' url: '/pages/users/refund/list?type=99'
}) })
} else { } else {
if (status == this.orderStatus) return; if (status == this.orderStatus) return;
@ -756,7 +756,7 @@
groupOrderList({ groupOrderList({
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type: 98 product_type: 99
}).then(res => { }).then(res => {
that.isReady = true; that.isReady = true;
let list = res.data.list || []; let list = res.data.list || [];
@ -783,7 +783,7 @@
status: arr, status: arr,
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type: 98 product_type: 99
}).then(res => { }).then(res => {
let list = res.data.list || []; let list = res.data.list || [];
let loadend = list.length < that.limit; let loadend = list.length < that.limit;

6
pages/users/refund/list.vue
View File

@ -111,7 +111,7 @@
isScroll: true, isScroll: true,
page: 1, page: 1,
limit: 15, limit: 15,
type: 1 type: 0
} }
}, },
onLoad(e) { onLoad(e) {
@ -153,7 +153,7 @@
}, },
getList() { getList() {
if (!this.isScroll) return if (!this.isScroll) return
if (this.type == 1) { if (this.type == 0) {
refundList({ refundList({
type: this.tabIndex, type: this.tabIndex,
page: this.page, page: this.page,
@ -167,7 +167,7 @@
}) })
} else { } else {
refundList({ refundList({
product_type: 98, product_type: this.type,
type: this.tabIndex, type: this.tabIndex,
page: this.page, page: this.page,
limit: this.limit limit: this.limit

BIN
static/tabbar_icon/a-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
static/tabbar_icon/a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
static/tabbar_icon/b-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
static/tabbar_icon/b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
static/tabbar_icon/c-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/tabbar_icon/c.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
static/tabbar_icon/d-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
static/tabbar_icon/d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
static/tabbar_icon/e-a.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
static/tabbar_icon/e.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
static/tabbar_icon/top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

13
store/modules/app.js
View File

@ -117,12 +117,16 @@ const actions = {
} else { } else {
apptype = 1 apptype = 1
} }
console.log(apptype, '11111')
Appversion({ Appversion({
version: os.appWgtVersion, version: os.appWgtVersion,
type: apptype type: apptype
}).then((res) => { }).then((res) => {
if (data) uni.showLoading({
if (Object.keys(res.data.appInfo).length > 0) {
uni.showLoading({
title: '检查更新中' title: '检查更新中'
}) })
@ -144,11 +148,12 @@ const actions = {
} catch (e) { } catch (e) {
console.log(e); console.log(e);
} }
if (data) uni.hideLoading(); uni.hideLoading();
} }
}
}).catch((err) => { }).catch((err) => {
console.log(err) // console.log(err)
}) })