Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old
This commit is contained in:
weipengfei
commit
398fa9e769
16
api/sale.js
16
api/sale.js
@ -35,8 +35,22 @@ export function checkchain(id,data) {
|
||||
export function finishchain(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) {
|
||||
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
24
pages.json
@ -1611,16 +1611,16 @@
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/plant_release/index",
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
"selectedIconPath": "static/tabbar_icon/d-a.png",
|
||||
"text": "发布",
|
||||
"visible": false
|
||||
"iconPath": "static/tabbar_icon/c.png",
|
||||
"selectedIconPath": "static/tabbar_icon/c-a.png",
|
||||
"text": "发布"
|
||||
|
||||
},
|
||||
{
|
||||
"pagePath": "pages/supply_chains/supply_chains",
|
||||
|
||||
"iconPath": "static/tabbar_icon/c.png",
|
||||
"selectedIconPath": "static/tabbar_icon/c-a.png",
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
"selectedIconPath": "static/tabbar_icon/d-a.png",
|
||||
"text": "供应"
|
||||
},
|
||||
{
|
||||
@ -1629,16 +1629,8 @@
|
||||
"selectedIconPath": "static/tabbar_icon/e-a.png",
|
||||
"text": "我的"
|
||||
}
|
||||
],
|
||||
"midButton": {
|
||||
"width": "68px",
|
||||
"height": "70px",
|
||||
"iconWidth": "48px",
|
||||
"selectedColor": "#E93323",
|
||||
"pagePath": "pages/plant_release/index",
|
||||
"iconPath": "static/tabbar_icon/d.png",
|
||||
"text": "发布"
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
<template>
|
||||
|
||||
<!-- #ifdef APP || H5 -->
|
||||
<view>
|
||||
<!-- #endif -->
|
||||
<view class="content">
|
||||
|
||||
<form @submit="formSubmit" report-submit='true'>
|
||||
<view class="release_content">
|
||||
|
||||
|
||||
<view class="release_item">
|
||||
<view class="release_item-one">
|
||||
<view class="item-one">
|
||||
@ -19,7 +16,7 @@
|
||||
<view class="item-one">
|
||||
委托周期
|
||||
</view>
|
||||
<view class="" @click="calendar">
|
||||
<view class="">
|
||||
|
||||
<input type="number" v-model="formData.entrust_day" />
|
||||
</view>
|
||||
@ -61,22 +58,15 @@
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<button class="release_btn button" form-type="submit">发布</button>
|
||||
<button class="release_btn button" form-type="submit">提交</button>
|
||||
</view>
|
||||
</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">
|
||||
<associated @close="close" @getProduct="getProduct" :checkedObj="productList"></associated>
|
||||
</uni-popup>
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -98,20 +88,8 @@
|
||||
return {
|
||||
value1: 1,
|
||||
value2: "",
|
||||
options1: [{
|
||||
text: "Shenzhen1",
|
||||
value: 1
|
||||
}, {
|
||||
options1: [],
|
||||
|
||||
text: "Shenzhen2",
|
||||
value: 2
|
||||
}, {
|
||||
|
||||
|
||||
text: "Shenzhen3",
|
||||
value: 3
|
||||
}],
|
||||
date: 1,
|
||||
productList: [],
|
||||
info: {
|
||||
startDate: '',
|
||||
@ -122,6 +100,14 @@
|
||||
selected: [],
|
||||
showMonth: false
|
||||
},
|
||||
formData: {
|
||||
entrust_mer_id: '',
|
||||
entrust_day: 15,
|
||||
is_type: "4",
|
||||
product_info: [],
|
||||
content: ''
|
||||
},
|
||||
type: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -287,6 +273,10 @@
|
||||
background: #F5F5F5;
|
||||
}
|
||||
|
||||
.content {
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.release_content {
|
||||
|
||||
@ -531,6 +521,10 @@
|
||||
}
|
||||
|
||||
.release_btn {
|
||||
margin-top: 100rpx;
|
||||
|
||||
position: absolute;
|
||||
bottom: 150rpx;
|
||||
left: 50%;
|
||||
margin-left: -347rpx;
|
||||
}
|
||||
</style>
|
||||
@ -10,7 +10,9 @@
|
||||
{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
|
||||
</view>
|
||||
<view class="top-two-two">
|
||||
2020-07-07 14:14:14
|
||||
<!-- 2020-07-07 14:14:14
|
||||
-->
|
||||
{{objinfo.entrust_start_date}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -37,7 +39,7 @@
|
||||
|
||||
</view>
|
||||
|
||||
<view class="content_center-two">
|
||||
<view class="content_center-two" v-if="objinfo">
|
||||
<view class="center-two">
|
||||
<view class="center-twoa">
|
||||
委托方:
|
||||
@ -92,15 +94,15 @@
|
||||
是否结束委托:
|
||||
</view>
|
||||
<view class="center-twob">
|
||||
{{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
|
||||
{{objinfo.entrust_finish==0?'未结束':""||objinfo.entrust_finish==1?'已结束':""||objinfo.entrust_finish==2?'商家拒绝':""||objinfo.entrust_finish==3?'申请':""}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="center-two" v-if="objinfo.entrust_finish_refusal">
|
||||
<view class="center-twoa">
|
||||
拒绝原因:
|
||||
</view>
|
||||
<view class="center-twob" style="text-align: left;">
|
||||
{{objinfo.entrust_finish_refusal}}
|
||||
<view class="center-twob" :style="{'text-align':objinfo.entrust_finish_refusal.length<15?'right':'left'}">
|
||||
{{objinfo.entrust_finish_refusal}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -112,7 +114,7 @@
|
||||
</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">
|
||||
<image :src="item.image[0]" mode="aspectFit"></image>
|
||||
</view>
|
||||
@ -122,7 +124,7 @@
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
|
||||
<button class="release_btn button" v-if="objinfo.mer_status==1&&type==1" @click="submit(objinfo)">发布</button>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -150,39 +152,49 @@
|
||||
img: require('@/static/images/wtt2.png')
|
||||
}
|
||||
],
|
||||
type:0,
|
||||
type: 0,
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.list(e.id)
|
||||
this.type=e.type
|
||||
this.type = e.type
|
||||
},
|
||||
onShow() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
|
||||
//商品详情
|
||||
list(id) {
|
||||
entrustdetail(id).then((res) => {
|
||||
|
||||
this.objinfo = res.data
|
||||
})
|
||||
},
|
||||
|
||||
submit(item){
|
||||
addEntrustCart({community_id:item.community_id}).then(res=>{
|
||||
|
||||
if(res.status==200){
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success'
|
||||
})
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
//商品宝贝详情
|
||||
Merchbaby(item) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/goods_details/index?id=${item.product_id}`
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
//提交购物车
|
||||
submit(item) {
|
||||
addEntrustCart({
|
||||
community_id: item.community_id
|
||||
}).then(res => {
|
||||
|
||||
if (res.status == 200) {
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success'
|
||||
})
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString()
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@ -192,9 +204,10 @@ type:0,
|
||||
|
||||
|
||||
<style lang="scss">
|
||||
.content{
|
||||
.content {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.content_top {
|
||||
height: 151rpx;
|
||||
background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
|
||||
@ -366,10 +379,8 @@ type:0,
|
||||
color: #FFFFFF;
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
margin-left:-347rpx;
|
||||
margin-left: -347rpx;
|
||||
position: fixed;
|
||||
bottom: 100rpx;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
@ -6,7 +6,7 @@
|
||||
<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
|
||||
</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-img">
|
||||
@ -14,10 +14,10 @@
|
||||
</view>
|
||||
<view class="content-one-txt">
|
||||
<view class="one-txt-a">
|
||||
{{item.content}}
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="one-txt-b">
|
||||
委托周期:{{item.day}}
|
||||
委托周期:{{item.entrust_day}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -25,12 +25,11 @@
|
||||
|
||||
|
||||
<view class="content-two_one" v-if="item.mer_status==0">
|
||||
<view class="content-two-edita" @click="order">
|
||||
<view class="content-two-edita" @click="order">
|
||||
待处理
|
||||
</view>
|
||||
|
||||
<view class="contentgn">
|
||||
<!-- <view class="contentgn_a" @click="soldEdit(item)">
|
||||
<!-- <view class="contentgn_a" @click="soldEdit(item)">
|
||||
处理
|
||||
</view>
|
||||
<span></span>-->
|
||||
@ -47,62 +46,62 @@
|
||||
</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>
|
||||
|
||||
<view class="contentgn">
|
||||
<view class="contentgn_a" @click="closingorder">
|
||||
<view class="contentgn_a" @click="closingorder(item)" v-if="item.entrust_finish==3">
|
||||
结束委托
|
||||
</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>
|
||||
<view class="contentgn_b" @click="detail(item)">
|
||||
详情
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content-two_one" v-if="item.type==3">
|
||||
|
||||
|
||||
<view class="content-two-editc" @click="declined">
|
||||
已拒绝
|
||||
</view>
|
||||
<view class="contentgn">
|
||||
<view class="contentgn_a">
|
||||
删除
|
||||
</view>
|
||||
<span></span>
|
||||
<view class="contentgn_b">
|
||||
详情
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="adddelegation" @click="addDelegation">
|
||||
<view class="adddelegation-one">
|
||||
<image src="@/static/images/delegation.png" mode=""></image>
|
||||
</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">
|
||||
删除
|
||||
</view>
|
||||
<span></span>
|
||||
<view class="contentgn_b">
|
||||
详情
|
||||
</view>
|
||||
</view>
|
||||
<view class="adddelegation-two">
|
||||
新增委托
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view v-if="orderList.length == 0 && this.where.page > 1">
|
||||
<view v-if="orderList.length == 0">
|
||||
<emptyPage title="暂无订单~"></emptyPage>
|
||||
</view>
|
||||
<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
|
||||
<uni-popup ref="bindmobile" type="center" @click="close">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
@ -114,19 +113,16 @@
|
||||
委托申请处理
|
||||
</view>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
结算周期: <span>{{obj.settle_cycle}}天</span>
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
利息比例: <span>{{obj.interest_rate}}%</span>
|
||||
</view>
|
||||
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="cancellation">
|
||||
<view class="cancellation" @click="passDelete(obj)">
|
||||
拒绝
|
||||
</view>
|
||||
<view class="determine">
|
||||
<view class="determine" @click="passagree(obj)">
|
||||
接受
|
||||
</view>
|
||||
</view>
|
||||
@ -136,7 +132,6 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup ref="bindmobile1" type="center" @click="close">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
@ -156,15 +151,11 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup ref="bindmobile2" type="center" @click="close">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
@ -175,20 +166,17 @@
|
||||
<view class="bg-content-a" style="margin-left: 207rpx;">
|
||||
结束委托申请处理
|
||||
</view>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
<view class="bg-content-b" v-if="obj.mer_info">
|
||||
结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
<view class="bg-content-c" v-if="obj.mer_info">
|
||||
利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
|
||||
</view>
|
||||
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="cancellation">
|
||||
<view class="cancellation" @click="refused">
|
||||
拒绝
|
||||
</view>
|
||||
<view class="determine">
|
||||
<view class="determine" @click="agree(obj)">
|
||||
接受
|
||||
</view>
|
||||
</view>
|
||||
@ -209,24 +197,19 @@
|
||||
<view class="bg-content-a" style="margin-left: 207rpx;">
|
||||
结束委托申请处理
|
||||
</view>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
<view class="bg-content-b" v-if="obj.mer_info">
|
||||
结算周期: <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 class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
|
||||
拒绝原因：
|
||||
<view class="" style="margin-top: 21rpx;">
|
||||
|
||||
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
|
||||
<textarea v-model="refuseds" placeholder="输入拒绝原因" class="bg-content_textarea" />
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="entrust_bga_btn" @click="agree(obj)">
|
||||
<view class="determine">
|
||||
接受
|
||||
</view>
|
||||
@ -242,34 +225,44 @@
|
||||
<script>
|
||||
import cxNavTitle from '@/components/cx-navTitle.vue'
|
||||
import emptyPage from '@/components/emptyPage.vue';
|
||||
import {
|
||||
entrustlist,
|
||||
finishchain,
|
||||
checkchain,
|
||||
finishentrust
|
||||
} from '@/api/sale.js'
|
||||
export default {
|
||||
components: {
|
||||
cxNavTitle,
|
||||
emptyPage
|
||||
emptyPage,
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
activeItem: "tabOne",
|
||||
status: 'loadmore',
|
||||
tabTitle: "",
|
||||
orderList: [],
|
||||
where: {
|
||||
page: 1,
|
||||
limit: 10
|
||||
limit: 10,
|
||||
type: 1,
|
||||
status: 0
|
||||
},
|
||||
tabs: [{
|
||||
name: "tabOne",
|
||||
label: '待处理',
|
||||
type: '1'
|
||||
type: 0
|
||||
},
|
||||
{
|
||||
name: "tabTwo",
|
||||
label: '已接受',
|
||||
type: '2'
|
||||
type: 1
|
||||
},
|
||||
{
|
||||
name: "tabThree",
|
||||
label: '已拒绝',
|
||||
type: '3'
|
||||
type: 2
|
||||
},
|
||||
|
||||
],
|
||||
@ -297,29 +290,49 @@
|
||||
type: 4
|
||||
|
||||
}
|
||||
]
|
||||
],
|
||||
obj: {},
|
||||
refuseds: ''
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.tabTitle = this.tabs[0].name
|
||||
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
|
||||
console.log(this.tabs[0])
|
||||
// console.log(this.tabs[0])
|
||||
|
||||
},
|
||||
mounted() {
|
||||
|
||||
this.commislist()
|
||||
},
|
||||
methods: {
|
||||
onReachBottom() {
|
||||
if (this.status == 'nomore') return;
|
||||
this.status = 'loading';
|
||||
this.where.page = ++this.where.page;
|
||||
this.commislist()
|
||||
},
|
||||
nav(item) {
|
||||
// uni.navigateTo({
|
||||
// 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) { //点击获取当前标签数据
|
||||
this.activeItem = e.name; //当前class类名
|
||||
this.tabTitle = e.name; //当前选的标签名
|
||||
this.where.page = 1
|
||||
this.orderList=[]
|
||||
this.orderList = []
|
||||
this.where.status = e.type
|
||||
this.commislist()
|
||||
},
|
||||
@ -337,25 +350,24 @@
|
||||
},
|
||||
//管理弹窗
|
||||
close() {
|
||||
console.log('1111111')
|
||||
this.$refs.bindmobile.close()
|
||||
this.$refs.bindmobile1.close()
|
||||
this.$refs.bindmobile2.close()
|
||||
this.$refs.bindmobile3.close()
|
||||
},
|
||||
//提交订单
|
||||
|
||||
order(item){
|
||||
if(item.mer_status==0&&entrust_order_id!=0){
|
||||
uni.navigateTo({
|
||||
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
|
||||
})
|
||||
}else{
|
||||
this.$util.Tips({
|
||||
title:'商家还没同意该订单',
|
||||
icon: 'err'
|
||||
})
|
||||
}
|
||||
|
||||
order(item) {
|
||||
if (item.mer_status == 0 && entrust_order_id != 0) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
|
||||
})
|
||||
} else {
|
||||
this.$util.Tips({
|
||||
title: '商家还没同意该订单',
|
||||
icon: 'err'
|
||||
})
|
||||
}
|
||||
},
|
||||
//详情
|
||||
|
||||
@ -366,28 +378,54 @@
|
||||
})
|
||||
},
|
||||
// 待处理
|
||||
soldEdit() {
|
||||
|
||||
soldEdit(item) {
|
||||
this.obj = item
|
||||
console.log(item)
|
||||
this.$refs.bindmobile.open()
|
||||
|
||||
|
||||
|
||||
|
||||
},
|
||||
//已接受
|
||||
accepted() {
|
||||
this.$refs.bindmobile1.open()
|
||||
|
||||
},
|
||||
//结束委托
|
||||
closingorder() {
|
||||
this.$refs.bindmobile3.open()
|
||||
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()
|
||||
}, 1000)
|
||||
},
|
||||
// 已拒绝
|
||||
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) {
|
||||
|
||||
checkchain(item.community_id, {
|
||||
status: 3
|
||||
}).then(res => {
|
||||
@ -398,6 +436,12 @@
|
||||
this.orderList = []
|
||||
this.tabTitle = "tabOne"
|
||||
this.commislist()
|
||||
}).catch((err) => {
|
||||
console.log(err)
|
||||
this.$util.Tips({
|
||||
title: err,
|
||||
icon: 'error'
|
||||
})
|
||||
})
|
||||
},
|
||||
// 审核未通过 编辑
|
||||
@ -438,10 +482,56 @@
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.content {
|
||||
height: 100vh;
|
||||
position: relative;
|
||||
|
||||
}
|
||||
|
||||
.content_top {
|
||||
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 {
|
||||
|
||||
@ -637,12 +727,11 @@
|
||||
}
|
||||
|
||||
span {
|
||||
width: 0px;
|
||||
width: 1px;
|
||||
height: 30rpx;
|
||||
opacity: 1;
|
||||
|
||||
margin-top: 10rpx;
|
||||
border: 2rpx solid #CCCCCC;
|
||||
margin-top: 8rpx;
|
||||
background-color: #cccccc;
|
||||
|
||||
}
|
||||
|
||||
@ -823,7 +912,7 @@
|
||||
|
||||
.entrust_bg-content {
|
||||
position: absolute;
|
||||
top: 404rpx;
|
||||
top: 304rpx;
|
||||
|
||||
.bg-content-a {
|
||||
margin-left: 242rpx;
|
||||
@ -869,7 +958,7 @@
|
||||
|
||||
.bg-content_textarea {
|
||||
width: 624rpx;
|
||||
height: 152rpx;
|
||||
height: 242rpx;
|
||||
padding: 25rpx 18rpx;
|
||||
|
||||
background: #F5F5F5;
|
||||
|
||||
@ -14,11 +14,15 @@
|
||||
</view>
|
||||
<view class="content-one-txt">
|
||||
<view class="one-txt-a">
|
||||
{{item.content}}
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="one-txt-b">
|
||||
委托周期:{{item.entrust_day}}
|
||||
</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>
|
||||
|
||||
@ -27,7 +31,7 @@
|
||||
待处理
|
||||
</view>
|
||||
<view class="contentgn">
|
||||
<view class="contentgn_a">
|
||||
<view class="contentgn_a" @click="soldEdit(item)">
|
||||
处理
|
||||
</view>
|
||||
<span></span>
|
||||
@ -44,17 +48,14 @@
|
||||
</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>
|
||||
|
||||
<view class="contentgn">
|
||||
<view class="contentgn_a" style="margin-left: 10rpx;"
|
||||
v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
|
||||
结束委托
|
||||
申请结束委托
|
||||
</view>
|
||||
<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;"
|
||||
@ -63,33 +64,26 @@
|
||||
</view>
|
||||
<span v-if="item.entrust_order_id==0"></span>
|
||||
|
||||
|
||||
|
||||
|
||||
<view class="contentgn_b" @click="detail(item)">
|
||||
详情
|
||||
</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>
|
||||
<view class="contentgn">
|
||||
<view class="contentgn_a">
|
||||
<!-- <view class="contentgn_a" click="deleteOrder(item)">
|
||||
删除
|
||||
</view>
|
||||
<span></span>
|
||||
<view class="contentgn_b">
|
||||
<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>
|
||||
@ -109,31 +103,27 @@
|
||||
<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">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
<image src="@/static/images/wt_close.png" mode=""></image>
|
||||
</view>
|
||||
<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>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
<view class="bg-content-b" >
|
||||
结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
<view class="bg-content-c" >
|
||||
利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
|
||||
</view>
|
||||
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="cancellation">
|
||||
<view class="cancellation" @click="passDelete(obj)">
|
||||
拒绝
|
||||
</view>
|
||||
<view class="determine">
|
||||
<view class="determine" @click="passagree(obj)">
|
||||
接受
|
||||
</view>
|
||||
</view>
|
||||
@ -143,7 +133,6 @@
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup ref="bindmobile1" type="center" @click="close">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
@ -164,15 +153,11 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</uni-popup>
|
||||
<uni-popup ref="bindmobile2" type="center" @click="close">
|
||||
|
||||
<view class="" style="position: relative;">
|
||||
<view class="entrust">
|
||||
<view class="entrust_close" @click="close">
|
||||
@ -185,13 +170,10 @@
|
||||
</view>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
</view>
|
||||
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="cancellation">
|
||||
拒绝
|
||||
@ -219,20 +201,15 @@
|
||||
</view>
|
||||
<view class="bg-content-b">
|
||||
结算周期: <span>30天</span>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
利息比例: <span>0.05%</span>
|
||||
</view>
|
||||
<view class="bg-content-c">
|
||||
|
||||
拒绝原因：
|
||||
<view class="" style="margin-top: 21rpx;">
|
||||
|
||||
<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="entrust_bga_btn">
|
||||
<view class="determine">
|
||||
@ -250,7 +227,11 @@
|
||||
<script>
|
||||
import cxNavTitle from '@/components/cx-navTitle.vue'
|
||||
import emptyPage from '@/components/emptyPage.vue';
|
||||
import {} from '@/api/sale.js'
|
||||
import {
|
||||
entrustlist,
|
||||
finishchain,
|
||||
checkchain
|
||||
} from '@/api/sale.js'
|
||||
export default {
|
||||
components: {
|
||||
cxNavTitle,
|
||||
@ -321,14 +302,32 @@
|
||||
|
||||
},
|
||||
mounted() {
|
||||
|
||||
this.commislist()
|
||||
},
|
||||
methods: {
|
||||
onReachBottom() {
|
||||
if (this.status == 'nomore') return;
|
||||
this.status = 'loading';
|
||||
this.where.page = ++this.where.page;
|
||||
this.commislist()
|
||||
},
|
||||
nav(item) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/commissionedSales/delegation_details/index'
|
||||
// uni.navigateTo({
|
||||
// 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) { //点击获取当前标签数据
|
||||
this.activeItem = e.name; //当前class类名
|
||||
this.tabTitle = e.name; //当前选的标签名
|
||||
@ -339,7 +338,6 @@
|
||||
},
|
||||
//管理弹窗
|
||||
close() {
|
||||
console.log('1111111')
|
||||
this.$refs.bindmobile.close()
|
||||
this.$refs.bindmobile1.close()
|
||||
this.$refs.bindmobile2.close()
|
||||
@ -356,14 +354,10 @@
|
||||
this.obj = item
|
||||
|
||||
this.$refs.bindmobile.open()
|
||||
|
||||
|
||||
|
||||
|
||||
},
|
||||
//已接受
|
||||
accepted() {
|
||||
this.$refs.bindmobile1.open()
|
||||
|
||||
},
|
||||
//结束委托
|
||||
closingorder(item) {
|
||||
@ -377,12 +371,13 @@
|
||||
url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
|
||||
})
|
||||
},
|
||||
//结束委托申请
|
||||
//申请结束委托申请
|
||||
deteragrss(item) {
|
||||
console.log(item)
|
||||
|
||||
finishchain(item.community_id, {
|
||||
status: 1
|
||||
}).then((res) => {
|
||||
console.log(res)
|
||||
this.$util.Tips({
|
||||
title: res.message,
|
||||
icon: 'success'
|
||||
@ -390,9 +385,9 @@
|
||||
this.orderList = []
|
||||
this.tabTitle = "tabTwo"
|
||||
this.commislist()
|
||||
this.$refs.bindmobile1.colse()
|
||||
}).catch((err)=>{
|
||||
|
||||
this.$refs.bindmobile1.close()
|
||||
}).catch((err) => {
|
||||
this.$refs.bindmobile1.close()
|
||||
this.$util.Tips({
|
||||
title: err,
|
||||
icon: 'error'
|
||||
@ -401,7 +396,8 @@
|
||||
},
|
||||
// 已拒绝
|
||||
declined() {
|
||||
this.$refs.bindmobile2.open()
|
||||
// this.$refs.bindmobile2.open()
|
||||
this.$refs.bindmobile3.open()
|
||||
},
|
||||
//删除订单
|
||||
deleteOrder(item) {
|
||||
@ -433,7 +429,7 @@
|
||||
this.orderList = []
|
||||
this.tabTitle = "tabOne"
|
||||
this.commislist()
|
||||
this.$refs.bindmobile1.colse()
|
||||
this.$refs.bindmobile.close()
|
||||
})
|
||||
},
|
||||
//审核通过 同意
|
||||
@ -838,7 +834,7 @@
|
||||
|
||||
.entrust_bg-content {
|
||||
position: absolute;
|
||||
top: 404rpx;
|
||||
top: 304rpx;
|
||||
|
||||
.bg-content-a {
|
||||
margin-left: 242rpx;
|
||||
@ -884,7 +880,7 @@
|
||||
|
||||
.bg-content_textarea {
|
||||
width: 624rpx;
|
||||
height: 152rpx;
|
||||
height: 242rpx;
|
||||
padding: 25rpx 18rpx;
|
||||
|
||||
background: #F5F5F5;
|
||||
|
||||
@ -157,16 +157,7 @@
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
uni.startLocationUpdate({
|
||||
success: res => {
|
||||
console.log('开启接收位置消息成功')
|
||||
|
||||
},
|
||||
fail: err => {
|
||||
this.selfLocation()
|
||||
},
|
||||
complete: msg => console.log('调用开启接收位置消息 API 完成')
|
||||
});
|
||||
|
||||
|
||||
//监听网络状态变化
|
||||
uni.onNetworkStatusChange((res) => {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="">
|
||||
<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
|
||||
<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
|
||||
<view class="head-wrapper"></view>
|
||||
<view class="town-title">{{town}}里海云仓</view>
|
||||
<view class="body-wrapper">
|
||||
@ -16,7 +16,6 @@
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
|
||||
<view class="" v-if="cloudList.length>0">
|
||||
<view class="">
|
||||
<!-- <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"
|
||||
height="50.82rpx" @click='goBack'></u--image>
|
||||
<view class="head_tit">
|
||||
通滩镇里海云仓
|
||||
{{town}}里海云仓
|
||||
</view>
|
||||
</view>
|
||||
<view class="head_r" @click="showPop=true">
|
||||
@ -98,18 +97,16 @@
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
</view>
|
||||
|
||||
<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"
|
||||
@click="screenGoods(item.screen,index)">
|
||||
{{item.tit}}
|
||||
</view>
|
||||
</view>
|
||||
<transition name="fade">
|
||||
<view class="content">
|
||||
<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"
|
||||
@click="screenGoods(item.screen,index)">
|
||||
{{item.tit}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<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'>
|
||||
<u-loading-icon v-if='showLoading' text="加载中" textSize="18"></u-loading-icon>
|
||||
</view>
|
||||
@ -149,7 +146,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view style="height: 100rpx;">
|
||||
|
||||
<!-- <u-loadmore :status="status" /> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -162,7 +159,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<view class="card" :style="`bottom:${appInfo.bottom}px`">
|
||||
<view class="left">
|
||||
<view class="" style="position: relative;">
|
||||
<u--image :showLoading="true" src="/static/images/LHYC/GWC.png" width="63.09rpx"
|
||||
@ -227,8 +224,12 @@
|
||||
height="400.09rpx"></u--image>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
@ -259,6 +260,7 @@
|
||||
data() {
|
||||
let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
|
||||
return {
|
||||
appInfo: {},
|
||||
pocls: "",
|
||||
type: "",
|
||||
act_swiper: "",
|
||||
@ -279,6 +281,7 @@
|
||||
cartList: [],
|
||||
activeClass: 'activeClass',
|
||||
headtop: "",
|
||||
page_num: 1,
|
||||
actList: [{
|
||||
tit: '综合',
|
||||
act: "",
|
||||
@ -292,14 +295,9 @@
|
||||
act: "",
|
||||
screen: "price_asc"
|
||||
}],
|
||||
list3: [
|
||||
'/static/images/LHYC/BG.png',
|
||||
'/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',
|
||||
],
|
||||
status: "loadmore",
|
||||
flag: false,
|
||||
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
@ -307,15 +305,31 @@
|
||||
uni.getSystemInfo({
|
||||
success: (res) => {
|
||||
this.winHeight = res.windowHeight
|
||||
this.appInfo = res.safeAreaInsets
|
||||
},
|
||||
});
|
||||
this.street_code = e.street
|
||||
this.town = e.town
|
||||
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) {
|
||||
let that = this
|
||||
this.showtit = !Boolean(e.scrollTop)
|
||||
@ -323,6 +337,7 @@
|
||||
.in(this)
|
||||
.select('.content')
|
||||
.boundingClientRect(rect => {
|
||||
// console.log(rect)
|
||||
if (rect.top <= this.headtop) {
|
||||
this.pocls = 'fixed'
|
||||
this.act_swiper = 'act_swiper'
|
||||
@ -355,7 +370,6 @@
|
||||
methods: {
|
||||
cartFn() {
|
||||
getCartList().then(res => {
|
||||
|
||||
this.cartList = res.data.list
|
||||
this.cartList[0].list.forEach(e => {
|
||||
this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
|
||||
@ -419,7 +433,9 @@
|
||||
street_code: this.street_code,
|
||||
category_id: this.cloudList[this.current].category_id,
|
||||
order: this.type,
|
||||
keyword: this.keyword
|
||||
keyword: this.keyword,
|
||||
// page_num: this.page_num
|
||||
|
||||
}).then(res => {
|
||||
this.goodsList = res.data.list
|
||||
this.showLoading = false
|
||||
@ -630,7 +646,8 @@
|
||||
}
|
||||
|
||||
.goods_list {
|
||||
|
||||
min-height: 100vh;
|
||||
// background-color: red;
|
||||
|
||||
.goods {
|
||||
display: flex;
|
||||
@ -705,7 +722,7 @@
|
||||
// }
|
||||
|
||||
.content_sift {
|
||||
width: 730rpx;
|
||||
width: 750rpx;
|
||||
padding: 22rpx 0;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
@ -727,7 +744,7 @@
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
// bottom: 0;
|
||||
background-color: #333333;
|
||||
height: 101.64rpx;
|
||||
border-radius: 50.82rpx;
|
||||
@ -861,7 +878,7 @@
|
||||
// align-items: center;
|
||||
// padding: 20vh 0;
|
||||
position: relative;
|
||||
height: 85vh;
|
||||
height: 100vh;
|
||||
|
||||
.info {
|
||||
position: absolute;
|
||||
|
||||
@ -61,6 +61,7 @@
|
||||
<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
|
||||
</view>
|
||||
<view class='progress acea-row row-between-wrapper'>
|
||||
|
||||
<view
|
||||
v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
|
||||
<view class='iconfont icon-webicon318 t-color'>
|
||||
@ -82,13 +83,17 @@
|
||||
|
||||
</view>
|
||||
<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>
|
||||
|
||||
|
||||
<view class='line' :class='orderInfo.status > 1 && orderInfo.status != 9 ? "b-color":""'
|
||||
v-if="orderInfo.order_type == 0"></view>
|
||||
|
||||
<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":"")'>
|
||||
</view>
|
||||
|
||||
<view class='line' :class='orderInfo.status > 2 && orderInfo.status != 9 ? "b-color":""'>
|
||||
</view>
|
||||
<view class='iconfont'
|
||||
@ -336,7 +341,7 @@
|
||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||
</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>
|
||||
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
|
||||
|
||||
@ -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 {
|
||||
if(val==1){
|
||||
uni.navigateTo({
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
<template>
|
||||
<view :style="viewColor">
|
||||
<!-- #ifdef H5 -->
|
||||
<view class="head-menu">
|
||||
<view class='iconfont icon-xiangzuo' @click="returns"></view>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<view v-if="followDetail != null && followDetail" class="main" @click.stop="showManage = false">
|
||||
<view v-if="followDetail.status != 1" class="approval_status">
|
||||
<view class="status_count" :class="followDetail.status == 0 ? 'status1' : 'status0'">
|
||||
|
||||
@ -273,7 +273,7 @@
|
||||
},
|
||||
onLoad(e) {
|
||||
this.id = e.mer_id
|
||||
// this.getMerchantInfo(e.mer_id)
|
||||
this.getMerchantInfo(e.mer_id)
|
||||
|
||||
this.isZiti = true
|
||||
this.isKuaidi = true
|
||||
|
||||
@ -14,7 +14,11 @@
|
||||
<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
|
||||
</navigator>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
|
||||
@change="dchange">
|
||||
</zbpSwiper>
|
||||
@ -70,8 +74,6 @@
|
||||
</view>
|
||||
|
||||
<view class="list-con">
|
||||
<!-- <view class="list-con-left"
|
||||
@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')"> -->
|
||||
<view class="list-con-left"
|
||||
@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
|
||||
<!-- <view class="list-con-title">
|
||||
@ -85,8 +87,6 @@
|
||||
<image src="@/static/images/f5.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<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"
|
||||
@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
|
||||
<!-- <view class="list-con-title">
|
||||
@ -99,8 +99,6 @@
|
||||
</view> -->
|
||||
<image src="@/static/images/f7.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<!-- <view class="con-right"
|
||||
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> -->
|
||||
<view class="con-right"
|
||||
@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
|
||||
<!-- <view class="list-con-title">
|
||||
@ -119,7 +117,10 @@
|
||||
<image src="@/static/images/f4.png" mode="aspectFit"></image>
|
||||
</view>
|
||||
<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 class="empty_wrapper" v-if="emptyShow">
|
||||
<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
|
||||
@ -128,14 +129,13 @@
|
||||
|
||||
<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
|
||||
@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="locationa"> 位置权限使用说明 </view>
|
||||
<view class="locationb"> 用于向你推荐最近门店 </view>
|
||||
</view>
|
||||
<!-- <m-tabbar native>
|
||||
<!-- <m-tabbar native>
|
||||
<template v-slot:tabbar_index_2>
|
||||
<view class="custom_style">
|
||||
<view class="custom_style_icon"></view>
|
||||
@ -199,7 +199,7 @@
|
||||
},
|
||||
isshow: false,
|
||||
locationArr: ({}),
|
||||
status: 'loadmore',
|
||||
|
||||
bgColor: '',
|
||||
showPicker: false,
|
||||
columnData: [],
|
||||
@ -223,20 +223,23 @@
|
||||
location: '',
|
||||
emptyShow: false,
|
||||
town: '',
|
||||
cateGoods: [],
|
||||
productList: [],
|
||||
recoList: [],
|
||||
articleList: [],
|
||||
street_id: '',
|
||||
street: '',
|
||||
bgColor: '',
|
||||
isFshow: false,
|
||||
backColor: 'rgba(252, 252, 252, 0)'
|
||||
backColor: 'rgba(252, 252, 252, 0)',
|
||||
loadend: false,
|
||||
loading: false,
|
||||
loadTitle: '加载更多',
|
||||
}
|
||||
},
|
||||
|
||||
onPullDownRefresh() {
|
||||
this.cateGoods = []
|
||||
this.list()
|
||||
|
||||
this.list(true);
|
||||
this.Area()
|
||||
uni.stopPullDownRefresh()
|
||||
},
|
||||
@ -263,11 +266,15 @@
|
||||
},
|
||||
|
||||
onReachBottom() {
|
||||
if (this.status == 'nomore') return;
|
||||
this.status = 'loading';
|
||||
this.where.page = ++this.where.page;
|
||||
if (this.productList.length > 0) {
|
||||
setTimeout(() => {
|
||||
this.list(false);
|
||||
}, 500)
|
||||
} else {
|
||||
this.list()
|
||||
}
|
||||
|
||||
this.list()
|
||||
|
||||
},
|
||||
beforeDestroy() {
|
||||
// 销毁监听事件
|
||||
@ -322,17 +329,59 @@
|
||||
|
||||
},
|
||||
//获取商品列表
|
||||
list(id) {
|
||||
list(isPage,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 {
|
||||
getProductHot(this.where.page, this.where.limit).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 = '';
|
||||
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_id = e.value[1].code
|
||||
this.town = e.value[1].name
|
||||
this.cateGoods=[]
|
||||
this.list(this.street_id)
|
||||
this.productList=[]
|
||||
this.list(true,this.street_id)
|
||||
this.$nextTick(() => {
|
||||
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_id = e.value[1].code
|
||||
this.town = e.value[1].name
|
||||
this.cateGoods=[]
|
||||
this.productList=[]
|
||||
this.list(this.street_id)
|
||||
},
|
||||
selfLocation() {
|
||||
@ -512,6 +561,7 @@
|
||||
lat: latitude,
|
||||
long: longitude
|
||||
}).then(res => {
|
||||
this.isshow = false
|
||||
this.town = res.data.address_reference.town.title
|
||||
this.street_id = res.data.address_reference.town.id
|
||||
this.street = res.data.address_component.street
|
||||
@ -522,6 +572,7 @@
|
||||
})
|
||||
this.list(this.street_id)
|
||||
}).catch(err => {
|
||||
this.isshow = false
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: 'none'
|
||||
|
||||
@ -732,7 +732,7 @@
|
||||
|
||||
if (status == 5) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/refund/list?type=0'
|
||||
url: '/pages/users/refund/list?type=98'
|
||||
})
|
||||
} else {
|
||||
if (status == this.orderStatus) return;
|
||||
|
||||
@ -490,7 +490,7 @@
|
||||
arrlist() {
|
||||
|
||||
refundList({
|
||||
product_type: 98,
|
||||
product_type: 99,
|
||||
type: 0,
|
||||
page: 1,
|
||||
limit: 1500
|
||||
@ -568,7 +568,7 @@
|
||||
getOrderData: function() {
|
||||
let that = this;
|
||||
orderData({
|
||||
product_type: 98
|
||||
product_type: 99
|
||||
}).then(res => {
|
||||
// console.log(res.data)
|
||||
that.$set(that, 'orderData', res.data);
|
||||
@ -729,7 +729,7 @@
|
||||
|
||||
if (status == 5) {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/refund/list?type=0'
|
||||
url: '/pages/users/refund/list?type=99'
|
||||
})
|
||||
} else {
|
||||
if (status == this.orderStatus) return;
|
||||
@ -756,7 +756,7 @@
|
||||
groupOrderList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
product_type: 98
|
||||
product_type: 99
|
||||
}).then(res => {
|
||||
that.isReady = true;
|
||||
let list = res.data.list || [];
|
||||
@ -783,7 +783,7 @@
|
||||
status: arr,
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
product_type: 98
|
||||
product_type: 99
|
||||
}).then(res => {
|
||||
let list = res.data.list || [];
|
||||
let loadend = list.length < that.limit;
|
||||
|
||||
@ -111,7 +111,7 @@
|
||||
isScroll: true,
|
||||
page: 1,
|
||||
limit: 15,
|
||||
type: 1
|
||||
type: 0
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
@ -153,7 +153,7 @@
|
||||
},
|
||||
getList() {
|
||||
if (!this.isScroll) return
|
||||
if (this.type == 1) {
|
||||
if (this.type == 0) {
|
||||
refundList({
|
||||
type: this.tabIndex,
|
||||
page: this.page,
|
||||
@ -167,7 +167,7 @@
|
||||
})
|
||||
} else {
|
||||
refundList({
|
||||
product_type: 98,
|
||||
product_type: this.type,
|
||||
type: this.tabIndex,
|
||||
page: this.page,
|
||||
limit: this.limit
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 3.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 3.9 KiB |
@ -117,38 +117,43 @@ const actions = {
|
||||
} else {
|
||||
apptype = 1
|
||||
}
|
||||
console.log(apptype, '11111')
|
||||
|
||||
Appversion({
|
||||
version: os.appWgtVersion,
|
||||
type: apptype
|
||||
}).then((res) => {
|
||||
if (data) uni.showLoading({
|
||||
title: '检查更新中'
|
||||
})
|
||||
|
||||
if (Object.keys(res.data.appInfo).length > 0) {
|
||||
|
||||
// 版本更新
|
||||
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
|
||||
compareVersions(res.data.appInfo.version,
|
||||
wgt_v) == 1) {
|
||||
try {
|
||||
let info = res.data.appInfo || {};
|
||||
let version = {
|
||||
title: info.title || '发现新版本',
|
||||
content: info.content || '修复了部分BUG',
|
||||
versionName: info.version || '1.0.1',
|
||||
downUrl: info.dow_url || '',
|
||||
force: info.force == 1 ? true : false, // 是否强制更新
|
||||
quiet: info.quiet == 1 ? true : false // 是否静默更新
|
||||
|
||||
uni.showLoading({
|
||||
title: '检查更新中'
|
||||
})
|
||||
|
||||
// 版本更新
|
||||
if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
|
||||
compareVersions(res.data.appInfo.version,
|
||||
wgt_v) == 1) {
|
||||
try {
|
||||
let info = res.data.appInfo || {};
|
||||
let version = {
|
||||
title: info.title || '发现新版本',
|
||||
content: info.content || '修复了部分BUG',
|
||||
versionName: info.version || '1.0.1',
|
||||
downUrl: info.dow_url || '',
|
||||
force: info.force == 1 ? true : false, // 是否强制更新
|
||||
quiet: info.quiet == 1 ? true : false // 是否静默更新
|
||||
}
|
||||
Updater.update(version);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
}
|
||||
Updater.update(version);
|
||||
} catch (e) {
|
||||
console.log(e);
|
||||
uni.hideLoading();
|
||||
}
|
||||
if (data) uni.hideLoading();
|
||||
}
|
||||
|
||||
}
|
||||
}).catch((err) => {
|
||||
console.log(err)
|
||||
// console.log(err)
|
||||
})
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user