代码更新
This commit is contained in:
jia
parent
8ba8aa8b80
commit
0842b4c4fb
@ -85,7 +85,8 @@
|
||||
watch: {
|
||||
location: {
|
||||
handler(newVal, oldVal) {
|
||||
if (newVal.address_component?.street) this.street = newVal.address_component.street
|
||||
console.log(newVal, oldVal)
|
||||
// if (newVal.address_component?.street) this.street = newVal.address_component.street
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
@ -95,7 +96,7 @@
|
||||
this.Area()
|
||||
if (this.location.address_component?.street) this.street = this.location.address_component.street
|
||||
// this.street = Cache.get('LOCATION_DATA',true)
|
||||
console.log( Cache.get('LOCATION_DATA'))
|
||||
// console.log( Cache.get('LOCATION_DATA'))
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
@ -39,12 +39,18 @@
|
||||
</image>
|
||||
<text class="text">提现管理</text>
|
||||
</view>
|
||||
<view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
|
||||
<view class="examine"
|
||||
@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">订单核销</text>
|
||||
</view>
|
||||
<!-- <view class="examine" @click="navigator(`/pages/nongKe/teach_video/teach_video`)">
|
||||
<image class="icon_img"
|
||||
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">视频教学</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -121,7 +127,7 @@
|
||||
</image>
|
||||
<text class="text">商户设置</text>
|
||||
</view>
|
||||
<view class="examine"
|
||||
<!-- <view class="examine"
|
||||
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
|
||||
</image>
|
||||
@ -137,7 +143,7 @@
|
||||
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
|
||||
</image>
|
||||
<text class="text">发布管理</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
|
||||
<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
|
||||
</image>
|
||||
|
||||
@ -1,132 +1,52 @@
|
||||
<template>
|
||||
<view>
|
||||
<view class='productList'>
|
||||
<view style="height: 150rpx;">
|
||||
<view class='search acea-row row-between-wrapper' style="background-color: white;"
|
||||
:class="'styleType'+store_street_theme">
|
||||
<view class="back" @click='backjJump()'>
|
||||
<view class="iconfont icon-xiangzuo" style="color: black;"></view>
|
||||
</view>
|
||||
<view class="serch_btn">
|
||||
<u-search borderColor='#3274F9' placeholder="请输入商品" v-model='sotreParam.keyword' bgColor="white"
|
||||
:showAction="false" inputAlign="center" height="30"></u-search>
|
||||
<div class="btn" @tap='searchSubmit'>搜索</div>
|
||||
</view>
|
||||
|
||||
<!-- <view class='input acea-row row-between-wrapper' style="mar"><text class='iconfont icon-sousuo'></text>
|
||||
<view class='productList' :style="viewColor">
|
||||
<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
|
||||
<!--#ifdef H5-->
|
||||
<view class="back" @click='backjJump()'>
|
||||
<view class="iconfont icon-xiangzuo"></view>
|
||||
</view>
|
||||
<!--#endif-->
|
||||
<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
|
||||
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
|
||||
:value='sotreParam.keyword' @confirm="searchSubmit"></input>
|
||||
</view> -->
|
||||
|
||||
<!-- <view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
|
||||
</view>
|
||||
<view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
|
||||
class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
|
||||
<view class="iconfont icon-dingwei"></view>
|
||||
<view class="right-text" v-if="recommend_address">
|
||||
{{recommend_address}}
|
||||
</view>
|
||||
<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
|
||||
</view> -->
|
||||
<view style="width: 20vw;display: flex;justify-content: space-around;">
|
||||
<u--image :showLoading="true" src="../../../static/images/tabbar/GWC.png" width="50rpx"
|
||||
height="50rpx"></u--image>
|
||||
<u--image :showLoading="true" src="../../../static/images/tabbar/XX.png" width="50rpx"
|
||||
height="50rpx"></u--image>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme"> -->
|
||||
<!-- <view class='nav acea-row row-middle' :class="'styleType'+store_street_theme"> -->
|
||||
<!-- <view v-for="item in downMenus" :key="item.key" class='item'
|
||||
</view>
|
||||
<view class="nav-wrapper" :class="'styleType'+store_street_theme">
|
||||
<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
|
||||
<view v-for="item in downMenus" :key="item.key" class='item'
|
||||
:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
|
||||
<view class="">
|
||||
{{item.title}}
|
||||
</view>
|
||||
<view class="line" :class="{'font-line':firstKey == item.key}">
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="item" @click="bindRight">
|
||||
<view>筛选
|
||||
<text class="iconfont icon-shaixuan"></text>
|
||||
</view>
|
||||
<view class="line">
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- </view> -->
|
||||
<!-- </view> -->
|
||||
</view>
|
||||
|
||||
<!-- 店铺 -->
|
||||
|
||||
<view class="tabs">
|
||||
<u-tabs :list="tabLists" @change="sectionChange" lineColor="#3274F9" :scrollable="false" lineWidth="40"
|
||||
inactiveStyle="color:#737373" activeStyle="color:black"></u-tabs>
|
||||
</view>
|
||||
<view class="store_wrapper">
|
||||
<view class="store_item" @click="goStore(item.mer_id)"
|
||||
:style="{ backgroundImage: `url(${item.mini_banner})`}" v-for="(item,index) in storeList"
|
||||
:key="index">
|
||||
<view class="head">
|
||||
<view>
|
||||
{{item.mer_name}}
|
||||
<!-- {{item.mer_id}} -->
|
||||
</view>
|
||||
<view>
|
||||
<u--image :showLoading="true" src="../../../static/images/tabbar/JD.png" width="105.14rpx"
|
||||
height="45.56rpx"></u--image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="left">
|
||||
<u--image :showLoading="true" :src="item.mer_avatar" width="136.68rpx"
|
||||
height="136.68rpx"></u--image>
|
||||
</view>
|
||||
<view class="rights">
|
||||
<view class="first_li">
|
||||
<view class="type">{{item.type_name}}</view>
|
||||
<view class="pf">店铺评分
|
||||
<u--image style="margin: 0 5rpx;" :showLoading="true"
|
||||
src="../../../static/images/tabbar/PF.png" width="15rpx" height="15rpx"
|
||||
v-for="items,indexs in Math.floor(item.product_score)"></u--image>
|
||||
</view>
|
||||
<view class="hot">1万关注</view>
|
||||
</view>
|
||||
<view class="" style="display: flex;justify-content: space-between;width: 65vw;">
|
||||
<view style="display: flex; "> <u--image :showLoading="true"
|
||||
src="../../../static/images/tabbar/DH.png" width="36.8rpx"
|
||||
height="36.8rpx"></u--image>
|
||||
<text> {{item.service_phone}} </text>
|
||||
</view>
|
||||
<view style="display: flex;"> <u--image :showLoading="true"
|
||||
src="../../../static/images/tabbar/SJ.png" width="36.8rpx"
|
||||
height="36.8rpx"></u--image>
|
||||
<text>
|
||||
{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view style="display: flex;">
|
||||
<u--image :showLoading="true" src="../../../static/images/tabbar/DW.png" width="36.8rpx"
|
||||
height="36.8rpx"></u--image>
|
||||
{{item.mer_address}}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<!--
|
||||
</view>
|
||||
<!-- 店铺 -->
|
||||
<block>
|
||||
<view class="store-wrapper">
|
||||
<view class="store-item" v-for="(item,index) in storeList" :key="index">
|
||||
<view class="head">
|
||||
<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
|
||||
</view>
|
||||
<view class="zhezhao">
|
||||
</view>
|
||||
<view class="zhezhao1" @click="goStore(item.mer_id)">
|
||||
<view class="title" style="display: ;">
|
||||
<view class="zhezhao1" @click="goStore(item.mer_id)">
|
||||
<view class="title">
|
||||
<view>{{item.mer_name}}
|
||||
</view>
|
||||
<span class="go_store">
|
||||
<span>
|
||||
{{item.type_name}}
|
||||
</span>
|
||||
</view>
|
||||
@ -158,10 +78,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
-->
|
||||
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="store_street_theme == 2">
|
||||
<view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
|
||||
<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
|
||||
@ -264,7 +182,7 @@
|
||||
<image src="@/static/images/guanbi.png" class="guanbi" @click="close"></image>
|
||||
</u-popup>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -298,21 +216,6 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tabLists: [{
|
||||
name: '默认',
|
||||
order: ''
|
||||
}, {
|
||||
name: '销量',
|
||||
order: 'sales'
|
||||
}, {
|
||||
name: '好评',
|
||||
order: 'rate'
|
||||
},
|
||||
{
|
||||
name: '距离',
|
||||
order: 'location'
|
||||
}
|
||||
],
|
||||
price: 0,
|
||||
stock: 0,
|
||||
nows: false,
|
||||
@ -330,27 +233,27 @@
|
||||
downKey: 0,
|
||||
downStatus: false,
|
||||
// 下拉菜单
|
||||
// downMenu: [{
|
||||
// title: '默认',
|
||||
// key: 0,
|
||||
// order: ""
|
||||
// },
|
||||
// {
|
||||
// title: '销量',
|
||||
// key: 1,
|
||||
// order: 'sales'
|
||||
// },
|
||||
// {
|
||||
// title: '好评',
|
||||
// key: 2,
|
||||
// order: 'rate'
|
||||
// },
|
||||
// {
|
||||
// title: '距离',
|
||||
// key: 3,
|
||||
// order: 'location'
|
||||
// }
|
||||
// ],
|
||||
downMenu: [{
|
||||
title: '默认',
|
||||
key: 0,
|
||||
order: ""
|
||||
},
|
||||
{
|
||||
title: '销量',
|
||||
key: 1,
|
||||
order: 'sales'
|
||||
},
|
||||
{
|
||||
title: '好评',
|
||||
key: 2,
|
||||
order: 'rate'
|
||||
},
|
||||
{
|
||||
title: '距离',
|
||||
key: 3,
|
||||
order: 'location'
|
||||
}
|
||||
],
|
||||
// 是否第一个
|
||||
firstKey: 0,
|
||||
// 商铺列表
|
||||
@ -379,19 +282,18 @@
|
||||
storeTypeArr: [], //店铺类型
|
||||
merList: [], //商户分类
|
||||
product_type: 0,
|
||||
show: false,
|
||||
image: '', //图片,
|
||||
credit_buy: '', //支持先货后款
|
||||
show:false,
|
||||
image: '' ,//图片,
|
||||
credit_buy:'',//支持先货后款
|
||||
};
|
||||
},
|
||||
onLoad(options) {
|
||||
|
||||
|
||||
console.log(options);
|
||||
this.product_type = options.product_type ?? 0
|
||||
if (options.street_id != undefined) {
|
||||
this.sotreParam.street_id = options.street_id
|
||||
}
|
||||
this.credit_buy = options.credit_buy
|
||||
this.credit_buy=options.credit_buy
|
||||
this.sotreParam.type_id = options.type_id
|
||||
this.sotreParam.type_id = options.type_id && options.type_id.split(',').toString() || ''
|
||||
this.sotreParam.category_id = options.cate_id && options.cate_id.split(',').toString() || ''
|
||||
@ -434,10 +336,6 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
sectionChange(e) {
|
||||
// console.log(e)
|
||||
this.set_where(e.index)
|
||||
},
|
||||
// 获取商户分类
|
||||
getClassfication: function() {
|
||||
let temp = []
|
||||
@ -595,7 +493,7 @@
|
||||
category_id: this.sotreParam.category_id,
|
||||
type_id: this.sotreParam.type_id,
|
||||
street_id: this.sotreParam.street_id,
|
||||
credit_buy: this.credit_buy
|
||||
credit_buy:this.credit_buy
|
||||
}
|
||||
if (this.latitude) {
|
||||
rqData.location = this.latitude + ',' + this.longitude
|
||||
@ -623,9 +521,8 @@
|
||||
}
|
||||
},
|
||||
searchSubmit: function(e) {
|
||||
|
||||
// let that = this;
|
||||
// this.$set(that.sotreParam, 'keyword', e.detail.value);
|
||||
let that = this;
|
||||
that.$set(that.sotreParam, 'keyword', e.detail.value);
|
||||
this.set_where(this.firstKey)
|
||||
},
|
||||
// 右侧切换
|
||||
@ -670,7 +567,7 @@
|
||||
this.storeList = []
|
||||
this.firstKey = e
|
||||
this.sotreParam.page = 1
|
||||
this.sotreParam.order = this.tabLists[e].order
|
||||
this.sotreParam.order = this.downMenu[e].order
|
||||
this.storeMerchantList();
|
||||
},
|
||||
backjJump() {
|
||||
@ -713,41 +610,20 @@
|
||||
this.storeMerchantList()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.serch_btn {
|
||||
// margin-bottom: 20rpx;
|
||||
position: relative;
|
||||
width: 70vw;
|
||||
|
||||
.btn {
|
||||
position: absolute;
|
||||
right: 5rpx;
|
||||
width: 115.65rpx;
|
||||
height: 55rpx;
|
||||
background-color: #3274F9;
|
||||
border-radius: 175.23rpx 175.23rpx 175.23rpx 175.23rpx;
|
||||
color: white;
|
||||
line-height: 55rpx;
|
||||
text-align: center;
|
||||
bottom: 6rpx;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.productList .search {
|
||||
width: 100%;
|
||||
height: 140rpx;
|
||||
height: 86rpx;
|
||||
padding: 0 20rpx;
|
||||
padding-top: 70rpx;
|
||||
// box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 0;
|
||||
z-index: 99;
|
||||
z-index: 9;
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
background-color: #fff;
|
||||
@ -782,16 +658,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
.go_store {
|
||||
color: white !important;
|
||||
background-color: #4DA0FA !important;
|
||||
border-radius: 15rpx !important;
|
||||
padding: 10rpx 20rpx !important;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.search-right.styleType2 .right-text,
|
||||
.search-right.styleType3 .right-text {
|
||||
color: #282828;
|
||||
@ -862,7 +728,7 @@
|
||||
z-index: 9;
|
||||
position: fixed;
|
||||
left: 0;
|
||||
top: 40rpx;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
margin-top: 86rpx;
|
||||
background-color: #fff;
|
||||
@ -983,91 +849,192 @@
|
||||
margin-left: 10rpx;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
// background-color: ;
|
||||
background-color: #F4F7FE;
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
}
|
||||
.store-wrapper {
|
||||
margin-top: 165rpx;
|
||||
border-top: 1px solid #F6F6F6;
|
||||
|
||||
.store_wrapper {
|
||||
|
||||
background-color: #F4F7FE;
|
||||
|
||||
.store_item {
|
||||
margin: 0 auto;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
width: 95vw;
|
||||
// backdrop-filter: blur(1000px);
|
||||
// height: 300rpx;
|
||||
// background-color: red;
|
||||
margin-top: 20rpx;
|
||||
box-sizing: border-box;
|
||||
// padding-bottom: 50rpx;
|
||||
// background-color: red;
|
||||
.store-item {
|
||||
margin: 20rpx auto;
|
||||
|
||||
.head {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
color: white;
|
||||
font-size: 30rpx;
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
padding: 25rpx;
|
||||
}
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #fff;
|
||||
|
||||
.content {
|
||||
padding: 25rpx;
|
||||
background-color: white;
|
||||
// height: 160.68rpx;
|
||||
display: flex;
|
||||
color: black;
|
||||
border-radius: 20rpx 20rpx 0 0;
|
||||
// width: ;
|
||||
|
||||
.left {
|
||||
margin-right: 20rpx;
|
||||
border-radius: 15rpx;
|
||||
overflow: hidden;
|
||||
.zhezhao {
|
||||
position: absolute;
|
||||
width: 95%;
|
||||
height: 150px;
|
||||
border-radius: 20rpx;
|
||||
z-index: 0;
|
||||
opacity: 0.5;
|
||||
background-color: #999;
|
||||
}
|
||||
|
||||
.rights {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
.bgc_img {
|
||||
position: absolute;
|
||||
width: 95%;
|
||||
height: 150px;
|
||||
background-size: cover;
|
||||
border-radius: 20rpx;
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
.first_li {
|
||||
.zhezhao1 {
|
||||
width: 100%;
|
||||
height: 150px;
|
||||
border-radius: 20rpx;
|
||||
z-index: 1;
|
||||
|
||||
.title {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
height: 50px;
|
||||
align-items: center;
|
||||
margin-left: 20px;
|
||||
z-index: 1;
|
||||
|
||||
.type {
|
||||
border: 1px solid #3274F9;
|
||||
color: #3274F9;
|
||||
padding: 0 10rpx;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
|
||||
.pf {
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
span {
|
||||
background-color: #F84221;
|
||||
color: white;
|
||||
padding: 0 10rpx;
|
||||
border-radius: 10rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-size: 12px;
|
||||
padding: 3px;
|
||||
border-radius: 5px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.coent {
|
||||
display: flex;
|
||||
margin-left: 20px;
|
||||
|
||||
.avater {
|
||||
width: 60px;
|
||||
height: 80px;
|
||||
|
||||
image {
|
||||
width: 60px;
|
||||
height: 80px;
|
||||
}
|
||||
}
|
||||
|
||||
.hot {
|
||||
color: #F84221;
|
||||
.text {
|
||||
.text_one {
|
||||
display: flex;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding-left: 10px;
|
||||
|
||||
image {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.text_one_r {
|
||||
margin-left: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.text_two {
|
||||
width: 270px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding-left: 10px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
image {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
.text_three {
|
||||
width: 270px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding-left: 10px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
image {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
.pro-box {
|
||||
white-space: nowrap;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 20rpx 20rpx 30rpx;
|
||||
|
||||
.pro-item {
|
||||
display: inline-block;
|
||||
width: 218rpx;
|
||||
margin-right: 14rpx;
|
||||
|
||||
.picture,
|
||||
/deep/image,
|
||||
uni-image {
|
||||
width: 100%;
|
||||
height: 214rpx;
|
||||
border-radius: 8rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.price {
|
||||
margin-top: 5rpx;
|
||||
font-size: 28rpx;
|
||||
color: var(--view-priceColor);
|
||||
font-weight: bold;
|
||||
|
||||
text {
|
||||
font-size: 28rpx;
|
||||
}
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.styleType3 {
|
||||
padding: 20rpx;
|
||||
|
||||
.pro-item {
|
||||
display: inline-block;
|
||||
background-color: #fff;
|
||||
border-radius: 16rpx;
|
||||
text-align: center;
|
||||
padding: 10rpx 0 20rpx;
|
||||
|
||||
.picture,
|
||||
/deep/image,
|
||||
uni-image {
|
||||
width: 194rpx;
|
||||
height: 194rpx;
|
||||
text-align: center;
|
||||
border-radius: 8rpx;
|
||||
position: relative;
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
.mer-item2 {
|
||||
@ -1154,13 +1121,12 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.guanbi {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin: 30px auto;
|
||||
}
|
||||
|
||||
|
||||
.pop {
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -305,9 +305,17 @@
|
||||
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel'
|
||||
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
|
||||
</navigator>
|
||||
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==98">确认收货
|
||||
|
||||
<view class="" v-if="orderInfo.activity_type==98">
|
||||
<view class='bnt b-color' @tap='confirmOrdera(orderInfo)' v-if="orderInfo.pay_type==8">111确认收货
|
||||
</view>
|
||||
<view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
|
||||
</view>
|
||||
</view>
|
||||
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-else>取件码</view>
|
||||
|
||||
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==0">取件码</view>
|
||||
|
||||
|
||||
</block>
|
||||
<block v-if="orderInfo.status == 2">
|
||||
<view class="bnt cancel" @click="allRefund"
|
||||
@ -913,22 +921,60 @@
|
||||
});
|
||||
},
|
||||
//收货弹窗
|
||||
confirmOrder: function(item) {
|
||||
|
||||
confirmOrdera: function(item) {
|
||||
this.receivingshow = true
|
||||
|
||||
},
|
||||
confirmOrderb: function(item) {
|
||||
let that = this;
|
||||
uni.showModal({
|
||||
title: '确认收货',
|
||||
content: '为保障权益，请收到货确认无误后，再确认收货',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
orderTake(item.order_id).then(res => {
|
||||
return that.$util.Tips({
|
||||
title: '操作成功',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
that.orderList.splice(index, 1);
|
||||
that.getOrderData();
|
||||
});
|
||||
}).catch(err => {
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
confirmOrder: function(item) {
|
||||
uni.showModal({
|
||||
title: '取件码',
|
||||
content: item.logistics_code,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
// console.log('用户点击确定');
|
||||
} else if (res.cancel) {
|
||||
// console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
queding() {
|
||||
if (orderInfo.activity_type == 98) {
|
||||
|
||||
let that = this;
|
||||
orderTake(that.order_id).then(res => {
|
||||
this.receivingshow = false
|
||||
that.getOrderInfo();
|
||||
return that.$util.Tips({
|
||||
title: '成功收货',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
|
||||
that.getOrderInfo();
|
||||
|
||||
});
|
||||
}).catch(err => {
|
||||
this.receivingshow = false
|
||||
@ -936,19 +982,7 @@
|
||||
title: err
|
||||
});
|
||||
})
|
||||
} else {
|
||||
uni.showModal({
|
||||
title: '取件码',
|
||||
content: item.logistics_code,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
// console.log('用户点击确定');
|
||||
} else if (res.cancel) {
|
||||
// console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
},
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<view class="release_item">
|
||||
<view class="photo_count">
|
||||
<view class="input_photo acea-row row-middle">
|
||||
<block v-if="tabActive == 2">
|
||||
<block v-if="tabActive == 1">
|
||||
<view class="pictrue" v-if="formData.video_link">
|
||||
<image class="video-bg" mode="widthFix" src="../static/images/video_bg.png"></image>
|
||||
<view class="videoHover" @click="videoshow">
|
||||
@ -27,7 +27,7 @@
|
||||
<view><text class='iconfont icon-tianjiashipin'></text></view>
|
||||
<view class="text">添加视频</view>
|
||||
</view>
|
||||
<view v-if="formData.image.length < 1" class="pictrue acea-row row-center-wrapper row-column add" @click.stop="clk">
|
||||
<view class="pictrue acea-row row-center-wrapper row-column add" @click.stop="clk">
|
||||
<view><text class='iconfont icon-fengmian'></text></view>
|
||||
<view class="text">添加封面</view>
|
||||
</view>
|
||||
@ -37,7 +37,7 @@
|
||||
<text class="cover_text" v-if="tabActive == 2">封面</text>
|
||||
<view class="close_btn" @click="DelPic(index)"><text class="iconfont icon-guanbi4"></text></view>
|
||||
</view>
|
||||
<block v-if="tabActive == 1">
|
||||
<block v-if="tabActive == 0">
|
||||
<view v-if="formData.image.length < 6" class="pictrue acea-row row-center-wrapper row-column add" @click.stop="clk">
|
||||
<view><text class='iconfont icon-icon25201'></text></view>
|
||||
<view class="text">添加图片</view>
|
||||
|
||||
@ -5,18 +5,14 @@
|
||||
<view class="card-top">
|
||||
<view class="title">{{item.mer_name}}</view>
|
||||
<view class="time">提交时间：{{item.create_time}}</view>
|
||||
<!-- <view v-if="item.fail_msg" class="reason">原因：{{item.fail_msg}}</view> -->
|
||||
<view v-if="item.fail_msg" class="reason">原因：{{item.fail_msg}}</view>
|
||||
</view>
|
||||
<view class="line"></view>
|
||||
<view class="card-bottom">
|
||||
<view class="card-status">
|
||||
<image class="status-icon" v-if="item.status === 0" src="../../../static/images/SJRZ/DSH.png"
|
||||
mode="">
|
||||
</image>
|
||||
<image class="status-icon" v-else-if="item.status === 1"
|
||||
src="../../../static/images/SJRZ/CG.png" mode=""></image>
|
||||
<image class="status-icon" v-else-if="item.status === 2"
|
||||
src="../../../static/images/SJRZ/SB_a.png" mode=""></image>
|
||||
<image class="status-icon" v-if="item.status === 0" src="../static/images/pending.png" mode=""></image>
|
||||
<image class="status-icon" v-else-if="item.status === 1" src="../static/images/passed.png" mode=""></image>
|
||||
<image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.png" mode=""></image>
|
||||
<text class="status-text">{{statusText(item.status)}}</text>
|
||||
</view>
|
||||
<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
|
||||
@ -87,17 +83,16 @@
|
||||
},
|
||||
// 跳转逻辑
|
||||
jump(item) {
|
||||
console.log(item)
|
||||
if ([0, 2].includes(item.status)) {
|
||||
console.log(item)
|
||||
uni.navigateTo({
|
||||
url: `/pages/store/merchantDetails/fali?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}`
|
||||
url: `/pages/store/settled/index?mer_i_id=${item.mer_intention_id}`
|
||||
})
|
||||
} else if (item.status === 1) {
|
||||
uni.navigateTo({
|
||||
url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}`
|
||||
})
|
||||
}
|
||||
|
||||
},
|
||||
//状态判断
|
||||
statusText(number) {
|
||||
@ -113,9 +108,9 @@
|
||||
statusBtn(number) {
|
||||
// 使用对象
|
||||
let statusData = {
|
||||
0: "",
|
||||
1: "查看详情",
|
||||
2: "查看详情",
|
||||
0: "编辑",
|
||||
1: "查看",
|
||||
2: "重新提交",
|
||||
};
|
||||
return statusData[number]
|
||||
},
|
||||
@ -130,91 +125,76 @@
|
||||
align-items: center;
|
||||
background-color: #F5F5F5;
|
||||
padding: 20rpx 30rpx;
|
||||
|
||||
.card-list {
|
||||
width: 100%;
|
||||
background-color: #fff;
|
||||
padding: 20rpx 24rpx;
|
||||
margin: 10rpx 20rpx;
|
||||
border-radius: 12rpx;
|
||||
|
||||
.card-top {
|
||||
height: 140rpx;
|
||||
|
||||
.title {
|
||||
font-size: 28rpx;
|
||||
font-weight: bold;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.time {
|
||||
color: #999999;
|
||||
font-size: 24rpx;
|
||||
padding: 5rpx 0;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
|
||||
.reason {
|
||||
color: #E93323;
|
||||
font-weight: bold;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.line {
|
||||
height: 2rpx;
|
||||
margin: 20rpx 0 20rpx 0;
|
||||
background-color: #EEEEEE;
|
||||
}
|
||||
|
||||
.card-bottom {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
color: #333;
|
||||
|
||||
.card-status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.status-icon {
|
||||
width: 50.82rpx;
|
||||
height: 50.82rpx;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
margin: 10rpx;
|
||||
}
|
||||
|
||||
.status-text {
|
||||
font-size: 28rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
.status-btn {
|
||||
font-size: 26rpx;
|
||||
color: #555;
|
||||
border: 1px solid #729FFA;
|
||||
border: 1px solid #999999;
|
||||
padding: 8rpx 32rpx;
|
||||
border-radius: 40rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.no-shop {
|
||||
width: 100%;
|
||||
background-color: #fff;
|
||||
height: 100vh;
|
||||
|
||||
.pictrue {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
color: $uni-nothing-text;
|
||||
|
||||
image {
|
||||
width: 414rpx;
|
||||
height: 380rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -1,25 +1,14 @@
|
||||
<template>
|
||||
<view v-if="!successful">
|
||||
<view style="height: var(--status-bar-height);background-color: #69D0F9;"></view>
|
||||
<view v-if="!successful" :style="viewColor">
|
||||
<form report-submit='true'>
|
||||
<view class='merchantsSettled'>
|
||||
<view class="merchantBgCount">
|
||||
<image mode="widthFix" class="merchantBg" src="../../../static/images/SJRZ/bg.png" alt="">
|
||||
<image mode="widthFix" class="merchantBg" :src="domain+'/static/diy/merchantBg'+keyColor+'.jpg'"
|
||||
alt="">
|
||||
</view>
|
||||
|
||||
<view class="application-record">
|
||||
<u--image :showLoading="true" src="../../../static/images/SJRZ/FH.png" width="28" height="28rpx"
|
||||
@click="goBack"></u--image>
|
||||
<view @click="jumpToList" style="display: flex;">
|
||||
<u--image :showLoading="true" src="../../../static/images/SJRZ/JL.png" width="38rpx"
|
||||
height="38rpx"></u--image> 申请记录
|
||||
</view>
|
||||
</view>
|
||||
<view class="tit">
|
||||
<u--image :showLoading="true" src="../../../static/images/SJRZ/main_tit.png" width="434.58rpx"
|
||||
height="78.86rpx"></u--image>
|
||||
<u--image :showLoading="true" src="../../../static/images/SJRZ/TIT.png" width="497.66rpx"
|
||||
height="42.06rpx"></u--image>
|
||||
<view class="application-record" @click="jumpToList">
|
||||
申请记录
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
<view class='list'>
|
||||
<view class="item">
|
||||
@ -70,7 +59,7 @@
|
||||
<view class="uni-list-cell">
|
||||
<view class="uni-list-cell-db acea-row row-middle">
|
||||
<text class="item-name">商户分类</text>
|
||||
<picker @change="bindPickerChange" class="my-picker" :value="index" :range="array"
|
||||
<picker @change="bindPickerChange" :value="index" :range="array"
|
||||
range-key="category_name">
|
||||
<input placeholder="请选择商户分类" type="text" readonly disabled
|
||||
v-model="mer_classification">
|
||||
@ -143,8 +132,7 @@
|
||||
</checkbox-group>
|
||||
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
|
||||
</view>
|
||||
<button class='submitBtn' :style="validate === true ? 'background:#3274F9':''"
|
||||
@click="formSubmit">提交申请</button>
|
||||
<button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
|
||||
</view>
|
||||
</view>
|
||||
</form>
|
||||
@ -313,9 +301,6 @@
|
||||
onShow() {},
|
||||
onReady() {},
|
||||
methods: {
|
||||
goBack() {
|
||||
uni.navigateBack()
|
||||
},
|
||||
//是否是农贸市场
|
||||
// change(e) {
|
||||
// this.isnum = (e === true ? 1 : 0)
|
||||
@ -382,7 +367,7 @@
|
||||
// 获取历史提交数据详情
|
||||
getGoodsDetails(id) {
|
||||
getGoodsDetails(id).then(res => {
|
||||
// console.log(res);
|
||||
console.log(res);
|
||||
let arr = Object.keys(this.merchantData)
|
||||
let resData = res.data
|
||||
arr.map(item => {
|
||||
@ -391,10 +376,10 @@
|
||||
this.merchantData.phone = resData.phone
|
||||
this.merchantData.classification = resData.merchant_category_id
|
||||
this.merchantData.mer_type = resData.mer_type_id
|
||||
this.area_id = resData.area_id
|
||||
this.street_id = resData.street_id
|
||||
this.mer_storeType = resData.mer_storeType
|
||||
this.village_id = resData.village_id
|
||||
this.area_id=resData.area_id
|
||||
this.street_id=resData.street_id
|
||||
this.mer_storeType=resData.mer_storeType
|
||||
this.village_id=resData.village_id
|
||||
})
|
||||
this.pics = resData.images
|
||||
this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
|
||||
@ -426,7 +411,7 @@
|
||||
this.validateBtn()
|
||||
},
|
||||
bindPickerChange1: function(e) {
|
||||
// console.log(e);
|
||||
console.log(e);
|
||||
this.index1 = e.target.value
|
||||
let idx = e.target.value
|
||||
this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
|
||||
@ -458,7 +443,7 @@
|
||||
getStoreType: function() {
|
||||
getStoreTypeApi()
|
||||
.then(res => {
|
||||
// console.log(res);
|
||||
console.log(res);
|
||||
this.storeTypeArr = res.data
|
||||
})
|
||||
.catch(res => {
|
||||
@ -611,7 +596,7 @@
|
||||
code: that.merchantData.yanzhengma,
|
||||
merchant_category_id: that.merchantData.classification,
|
||||
mer_type_id: that.merchantData.mer_type,
|
||||
mer_storeType: this.mer_storeType,
|
||||
mer_storeType:this.mer_storeType,
|
||||
area_id: this.area_id,
|
||||
street_id: this.street_id,
|
||||
village_id: this.village_id,
|
||||
@ -696,11 +681,11 @@
|
||||
if (!value.classification) return that.$util.Tips({
|
||||
title: '请选择商户分类'
|
||||
});
|
||||
if (!this.mer_storeType) return that.$util.Tips({
|
||||
title: '请选择商户类型'
|
||||
if(!this.mer_storeType) return that.$util.Tips({
|
||||
title:'请选择商户类型'
|
||||
})
|
||||
if (!this.business_name) return that.$util.Tips({
|
||||
title: '请选择店铺所在地'
|
||||
if(!this.business_name) return that.$util.Tips({
|
||||
title:'请选择店铺所在地'
|
||||
})
|
||||
if (!that.isAgree) return that.$util.Tips({
|
||||
title: '请勾选并同意入驻协议'
|
||||
@ -739,9 +724,9 @@
|
||||
<style scoped lang="scss">
|
||||
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
|
||||
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
|
||||
border: 1px solid #3274F9 !important;
|
||||
background-color: #3274F9 !important;
|
||||
color: white !important;
|
||||
border: 1px solid var(--view-theme) !important;
|
||||
background-color: var(--view-theme) !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
.uni-input-placeholder {
|
||||
@ -768,18 +753,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
.tit {
|
||||
position: absolute;
|
||||
height: 175.44rpx;
|
||||
// background-color: red;
|
||||
top: 100rpx;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.merchantBgCount {
|
||||
line-height: 0;
|
||||
}
|
||||
@ -806,23 +779,14 @@
|
||||
}
|
||||
|
||||
.application-record {
|
||||
height: 40rpx;
|
||||
position: absolute;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: 100vw;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
top: 40rpx;
|
||||
top: 240rpx;
|
||||
right: 0;
|
||||
/* #ifdef APP-PLUS */
|
||||
top: var(--status-bar-height);
|
||||
/* #endif */
|
||||
color: #fff;
|
||||
font-size: 22rpx;
|
||||
line-height: 38rpx;
|
||||
// background-color: rgba(0, 0, 0, 0.3);
|
||||
background-color: rgba(0, 0, 0, 0.3);
|
||||
padding: 8rpx 18rpx;
|
||||
border-radius: 20px 0px 0px 20px;
|
||||
}
|
||||
@ -1032,10 +996,9 @@
|
||||
position: absolute;
|
||||
width: 93px;
|
||||
line-height: 27px;
|
||||
border: 1px solid #3274F9;
|
||||
border: 1px solid var(--view-theme);
|
||||
border-radius: 15px;
|
||||
color: #3274F9;
|
||||
// color: $primary-color;
|
||||
color: var(--view-theme);
|
||||
text-align: center;
|
||||
bottom: 8px;
|
||||
right: 0;
|
||||
@ -1059,7 +1022,7 @@
|
||||
color: #fff;
|
||||
background: #E3E3E3;
|
||||
margin-top: 25px;
|
||||
// pointer-events: none;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.merchantsSettled .submitBtn.on {
|
||||
@ -1278,6 +1241,4 @@
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.my-picker {}
|
||||
</style>
|
||||
@ -164,13 +164,13 @@
|
||||
<view class='discount'>暂无优惠券</view>
|
||||
</block>
|
||||
</view>
|
||||
<view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
|
||||
<!-- <view v-if="item.openReceipt == 1" class='item acea-row row-between-wrapper'>
|
||||
<view>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
|
||||
<view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
|
||||
{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
|
||||
<text class='iconfont icon-jiantou'></text>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
|
||||
class="item acea-row row-between-wrapper"
|
||||
style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
</view>
|
||||
<view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
|
||||
<view>售后/退款</view>
|
||||
<view class='num'>{{orderData.noComment || 0}}</view>
|
||||
<view class='num'>{{len || 0}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!--定金预售订单-->
|
||||
@ -169,7 +169,7 @@
|
||||
v-if="item.order_type==1">{{item.takeOrderCount > 0 ? '部分核销' : '待核销'}}</text>
|
||||
<!-- <text v-else>待发货</text> -->
|
||||
</view>
|
||||
|
||||
|
||||
<view v-if="item.order_status == 2 && item.pay_type !=3" class='t-color'>待发货</view>
|
||||
<view v-if="item.order_status == 1 && item.pay_type==3" class='t-color'>待付款</view>
|
||||
<view v-if="item.order_status == 3" class='t-color'>待收货</view>
|
||||
@ -264,10 +264,11 @@
|
||||
<view class='bnt cancelBnt'
|
||||
v-if="item.delivery_type == 1 || item.delivery_type == 2"
|
||||
@click='goOrderDetails(item.order_id)'>查看物流</view>
|
||||
<view class='bnt b-color' @tap='confirmOrder(item,index)'v-if='item.activity_type==98&&item.pay_type==8'>
|
||||
确认收货
|
||||
</view>
|
||||
<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
|
||||
<view class='bnt b-color' @tap='confirmOrder(item,index)'
|
||||
v-if='item.activity_type==98&&item.pay_type==8'>
|
||||
确认收货
|
||||
</view>
|
||||
<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
|
||||
</block>
|
||||
<block v-if="item.status == 2">
|
||||
<!-- <navigator v-if="community_status == 1 && !item.community_id" :url="'/pages/plantGrass/plant_release/index?order_id='+item.order_id" class='bnt colorBnt' hover-class="none">
|
||||
@ -304,21 +305,21 @@
|
||||
<payment :payMode='payMode' :pay_close="pay_close" @onChangeFun='onChangeFun' :order_id="pay_order_id"
|
||||
:totalPrice='totalPrice'></payment>
|
||||
<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
|
||||
<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
|
||||
<view class="warp">
|
||||
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
|
||||
<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
|
||||
</view>
|
||||
<view class="textp">
|
||||
<h3>确认收到货了吗?</h3>
|
||||
<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
|
||||
<button class="shouhuobtn" @click="queding()">
|
||||
|
||||
确认
|
||||
</button>
|
||||
<view class="cle" @click="close">取消</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
<u-popup :show="receivingshow" bgColor='transparent' mode='center'>
|
||||
<view class="warp">
|
||||
<image @click="close" class="guanbi" src="@/static/images/guanbi.png"></image>
|
||||
<image src="@/static/images/shouhuo.png" mode="widthFix"></image>
|
||||
</view>
|
||||
<view class="textp">
|
||||
<h3>确认收到货了吗?</h3>
|
||||
<span>此订单为先货后款订单，确认收货后将开始计算结算周期。为保障售后权益，请检查后再确认收货。</span>
|
||||
<button class="shouhuobtn" @click="queding()">
|
||||
|
||||
确认
|
||||
</button>
|
||||
<view class="cle" @click="close">取消</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -342,6 +343,7 @@
|
||||
groupOrderList,
|
||||
orderTake,
|
||||
applyInvoiceApi,
|
||||
refundList
|
||||
} from '@/api/order.js';
|
||||
import {
|
||||
getUserInfo
|
||||
@ -383,6 +385,7 @@
|
||||
orderStatus: 0, //订单状态
|
||||
page: 1,
|
||||
limit: 20,
|
||||
receivingshow: false,
|
||||
domain: HTTP_REQUEST_URL,
|
||||
payMode: [{
|
||||
name: "微信支付",
|
||||
@ -411,13 +414,15 @@
|
||||
pay_order_id: '',
|
||||
invoice_order_id: '',
|
||||
totalPrice: '0',
|
||||
order_id: 0,
|
||||
isAuto: false, //没有授权的不会自动授权
|
||||
isShowAuth: false, //是否隐藏授权
|
||||
isReady: true,
|
||||
invoice: {
|
||||
invoice: false,
|
||||
add: false,
|
||||
}
|
||||
},
|
||||
len:0
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -447,8 +452,22 @@
|
||||
}
|
||||
},
|
||||
onReady() {},
|
||||
mounted: function() {},
|
||||
mounted: function() {
|
||||
this.arrlist()
|
||||
},
|
||||
methods: {
|
||||
arrlist() {
|
||||
|
||||
refundList({
|
||||
product_type: 98,
|
||||
type: 0,
|
||||
page: 1,
|
||||
limit: 1500
|
||||
|
||||
}).then(res => {
|
||||
this.len = res.data.list.length
|
||||
})
|
||||
},
|
||||
// 后退
|
||||
returns() {
|
||||
uni.navigateBack()
|
||||
@ -584,8 +603,8 @@
|
||||
* 去订单详情
|
||||
*/
|
||||
goOrderDetails: function(order_id) {
|
||||
|
||||
|
||||
|
||||
|
||||
let self = this
|
||||
if (!order_id) return that.$util.Tips({
|
||||
title: '缺少订单号无法查看订单详情'
|
||||
@ -657,12 +676,12 @@
|
||||
* 切换类型
|
||||
*/
|
||||
statusClick: function(status) {
|
||||
|
||||
if(status==5){
|
||||
|
||||
if (status == 5) {
|
||||
uni.navigateTo({
|
||||
url:'/pages/users/refund/list?type=0'
|
||||
url: '/pages/users/refund/list?type=0'
|
||||
})
|
||||
}else{
|
||||
} else {
|
||||
if (status == this.orderStatus) return;
|
||||
this.orderStatus = status;
|
||||
this.loadend = false;
|
||||
@ -785,35 +804,39 @@
|
||||
});
|
||||
})
|
||||
},
|
||||
close() {
|
||||
this.receivingshow = false
|
||||
},
|
||||
//收货弹窗
|
||||
confirmOrder: function(item) {
|
||||
|
||||
console.log(item)
|
||||
this.order_id = item.order_id
|
||||
this.receivingshow = true
|
||||
|
||||
|
||||
},
|
||||
queding() {
|
||||
|
||||
let that = this;
|
||||
orderTake(that.order_id).then(res => {
|
||||
this.receivingshow = false
|
||||
return that.$util.Tips({
|
||||
title: '成功收货',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
|
||||
that.getOrderInfo();
|
||||
});
|
||||
}).catch(err => {
|
||||
this.receivingshow = false
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
let that = this;
|
||||
orderTake(that.order_id).then(res => {
|
||||
this.receivingshow = false
|
||||
return that.$util.Tips({
|
||||
title: '成功收货',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
|
||||
that.getOrderInfo();
|
||||
});
|
||||
}).catch(err => {
|
||||
this.receivingshow = false
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
},
|
||||
|
||||
|
||||
// 确认收货
|
||||
confirmOrdera: function(item, index) {
|
||||
let that = this;
|
||||
@ -873,6 +896,59 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.warp {
|
||||
margin: auto;
|
||||
|
||||
.guanbi {
|
||||
position: absolute;
|
||||
right: 0px;
|
||||
top: 120rpx;
|
||||
z-index: 1;
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.textp {
|
||||
width: 320px;
|
||||
padding-bottom: 20px;
|
||||
position: absolute;
|
||||
top: 110px;
|
||||
border-radius: 10px;
|
||||
|
||||
span {
|
||||
display: block;
|
||||
width: 280px;
|
||||
padding-top: 20px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
h3 {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.shouhuobtn {
|
||||
margin: auto;
|
||||
line-height: 54px;
|
||||
margin-top: 30px;
|
||||
width: 191px;
|
||||
height: 54px;
|
||||
color: white;
|
||||
background: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
|
||||
border-radius: 27px 27px 27px 27px;
|
||||
}
|
||||
|
||||
.cle {
|
||||
margin: auto;
|
||||
text-align: center;
|
||||
margin-top: 15px;
|
||||
height: 40px;
|
||||
background-color: #FFFFFF;
|
||||
border-radius: 10px;
|
||||
color: #999999;
|
||||
}
|
||||
}
|
||||
|
||||
.head-menu {
|
||||
height: 50rpx;
|
||||
padding-left: 20rpx;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user