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

代码更新

Browse Source
This commit is contained in:
jia 2023-08-28 20:02:22 +08:00
parent 8ba8aa8b80
commit 0842b4c4fb
10 changed files with 621 additions and 753 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/zbpSwiper.vue
View File

@ -85,7 +85,8 @@
watch: { watch: {
location: { location: {
handler(newVal, oldVal) { 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 immediate: true
} }
@ -95,7 +96,7 @@
this.Area() this.Area()
if (this.location.address_component?.street) this.street = this.location.address_component.street if (this.location.address_component?.street) this.street = this.location.address_component.street
// this.street = Cache.get('LOCATION_DATA',true) // this.street = Cache.get('LOCATION_DATA',true)
console.log( Cache.get('LOCATION_DATA')) // console.log( Cache.get('LOCATION_DATA'))
}, },
methods: { methods: {

14
pages/gather/gather.vue
View File

@ -39,12 +39,18 @@
</image> </image>
<text class="text">提现管理</text> <text class="text">提现管理</text>
</view> </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" <image class="icon_img"
src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill"> src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/spjs.png" mode="aspectFill">
</image> </image>
<text class="text">视频教学</text> <text class="text">视频教学</text>
</view> </view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <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 class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image> </image>
@ -121,7 +127,7 @@
</image> </image>
<text class="text">商户设置</text> <text class="text">商户设置</text>
</view> </view>
<view class="examine" <!-- <view class="examine"
@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)"> @click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
</image> </image>
@ -137,7 +143,7 @@
<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill"> <image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
</image> </image>
<text class="text">发布管理</text> <text class="text">发布管理</text>
</view> </view> -->
<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)"> <!-- <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 class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
</image> </image>

454
pages/nongKe/supply_chain/supplier.vue
View File

@ -1,121 +1,41 @@
<template> <template>
<view> <view>
<view class='productList'> <view class='productList' :style="viewColor">
<view style="height: 150rpx;"> <view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
<view class='search acea-row row-between-wrapper' style="background-color: white;" <!--#ifdef H5-->
:class="'styleType'+store_street_theme">
<view class="back" @click='backjJump()'> <view class="back" @click='backjJump()'>
<view class="iconfont icon-xiangzuo" style="color: black;"></view> <view class="iconfont icon-xiangzuo"></view>
</view> </view>
<view class="serch_btn"> <!--#endif-->
<u-search borderColor='#3274F9' placeholder="请输入商品" v-model='sotreParam.keyword' bgColor="white" <view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
: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>
<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search" <input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
:value='sotreParam.keyword' @confirm="searchSubmit"></input> :value='sotreParam.keyword' @confirm="searchSubmit"></input>
</view> --> </view>
<view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
<!-- <view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'> class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
<view class="iconfont icon-dingwei"></view> <view class="iconfont icon-dingwei"></view>
<view class="right-text" v-if="recommend_address"> <view class="right-text" v-if="recommend_address">
{{recommend_address}} {{recommend_address}}
</view> </view>
<view class="iconfont icon-xiangyou" v-if="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> </view>
<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme"> --> <view class="nav-wrapper" :class="'styleType'+store_street_theme">
<!-- <view class='nav acea-row row-middle' :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 v-for="item in downMenus" :key="item.key" class='item'
:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'> :class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
<view class=""> <view class="">
{{item.title}} {{item.title}}
</view> </view>
<view class="line" :class="{'font-line':firstKey == item.key}"> <view class="line" :class="{'font-line':firstKey == item.key}">
</view> </view>
</view> -->
<!-- <view class="item" @click="bindRight">
<view>筛选
<text class="iconfont icon-shaixuan"></text>
</view>
<view class="line">
</view>
</view> -->
<!-- </view> -->
<!-- </view> -->
</view> </view>
</view>
</view>
<!-- 店铺 --> <!-- 店铺 -->
<block>
<view class="tabs"> <view class="store-wrapper">
<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 class="store-item" v-for="(item,index) in storeList" :key="index"> <view class="store-item" v-for="(item,index) in storeList" :key="index">
<view class="head"> <view class="head">
<view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}"> <view class="bgc_img" :style="{ backgroundImage: `url(${item.mini_banner})`}">
@ -123,10 +43,10 @@
<view class="zhezhao"> <view class="zhezhao">
</view> </view>
<view class="zhezhao1" @click="goStore(item.mer_id)"> <view class="zhezhao1" @click="goStore(item.mer_id)">
<view class="title" style="display: ;"> <view class="title">
<view>{{item.mer_name}} <view>{{item.mer_name}}
</view> </view>
<span class="go_store"> <span>
{{item.type_name}} {{item.type_name}}
</span> </span>
</view> </view>
@ -158,10 +78,8 @@
</view> </view>
</view> </view>
</view> </view>
-->
</view> </view>
</block>
<block v-if="store_street_theme == 2"> <block v-if="store_street_theme == 2">
<view class="mer-item2" v-for="(item,index) in storeList" :key='index'> <view class="mer-item2" v-for="(item,index) in storeList" :key='index'>
<view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)"> <view class="mer-hd mer-shop-count" @click="goStore(item.mer_id)">
@ -298,21 +216,6 @@
}, },
data() { data() {
return { return {
tabLists: [{
name: '默认',
order: ''
}, {
name: '销量',
order: 'sales'
}, {
name: '好评',
order: 'rate'
},
{
name: '距离',
order: 'location'
}
],
price: 0, price: 0,
stock: 0, stock: 0,
nows: false, nows: false,
@ -330,27 +233,27 @@
downKey: 0, downKey: 0,
downStatus: false, downStatus: false,
// 下拉菜单 // 下拉菜单
// downMenu: [{ downMenu: [{
// title: '默认', title: '默认',
// key: 0, key: 0,
// order: "" order: ""
// }, },
// { {
// title: '销量', title: '销量',
// key: 1, key: 1,
// order: 'sales' order: 'sales'
// }, },
// { {
// title: '好评', title: '好评',
// key: 2, key: 2,
// order: 'rate' order: 'rate'
// }, },
// { {
// title: '距离', title: '距离',
// key: 3, key: 3,
// order: 'location' order: 'location'
// } }
// ], ],
// 是否第一个 // 是否第一个
firstKey: 0, firstKey: 0,
// 商铺列表 // 商铺列表
@ -385,8 +288,7 @@
}; };
}, },
onLoad(options) { onLoad(options) {
console.log(options);
this.product_type = options.product_type ?? 0 this.product_type = options.product_type ?? 0
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
@ -434,10 +336,6 @@
}) })
} }
}, },
sectionChange(e) {
// console.log(e)
this.set_where(e.index)
},
// 获取商户分类 // 获取商户分类
getClassfication: function() { getClassfication: function() {
let temp = [] let temp = []
@ -623,9 +521,8 @@
} }
}, },
searchSubmit: function(e) { searchSubmit: function(e) {
let that = this;
// let that = this; that.$set(that.sotreParam, 'keyword', e.detail.value);
// this.$set(that.sotreParam, 'keyword', e.detail.value);
this.set_where(this.firstKey) this.set_where(this.firstKey)
}, },
// 右侧切换 // 右侧切换
@ -670,7 +567,7 @@
this.storeList = [] this.storeList = []
this.firstKey = e this.firstKey = e
this.sotreParam.page = 1 this.sotreParam.page = 1
this.sotreParam.order = this.tabLists[e].order this.sotreParam.order = this.downMenu[e].order
this.storeMerchantList(); this.storeMerchantList();
}, },
backjJump() { backjJump() {
@ -718,36 +615,15 @@
</script> </script>
<style lang="scss" scoped> <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 { .productList .search {
width: 100%; width: 100%;
height: 140rpx; height: 86rpx;
padding: 0 20rpx; padding: 0 20rpx;
padding-top: 70rpx; box-sizing: border-box;
// box-sizing: border-box;
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
z-index: 99; z-index: 9;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
background-color: #fff; 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.styleType2 .right-text,
.search-right.styleType3 .right-text { .search-right.styleType3 .right-text {
color: #282828; color: #282828;
@ -862,7 +728,7 @@
z-index: 9; z-index: 9;
position: fixed; position: fixed;
left: 0; left: 0;
top: 40rpx; top: 0;
width: 100%; width: 100%;
margin-top: 86rpx; margin-top: 86rpx;
background-color: #fff; background-color: #fff;
@ -983,91 +849,192 @@
margin-left: 10rpx; margin-left: 10rpx;
} }
.tabs { .store-wrapper {
// background-color: ; margin-top: 165rpx;
background-color: #F4F7FE; border-top: 1px solid #F6F6F6;
border-radius: 20rpx 20rpx 0 0;
}
.store_wrapper { .store-item {
margin: 20rpx auto;
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;
.head { .head {
display: flex; display: flex;
justify-content: space-between; align-items: center;
color: white; justify-content: center;
font-size: 30rpx; color: #fff;
background-color: rgba(0, 0, 0, 0.3);
padding: 25rpx; .zhezhao {
position: absolute;
width: 95%;
height: 150px;
border-radius: 20rpx;
z-index: 0;
opacity: 0.5;
background-color: #999;
} }
.content { .bgc_img {
padding: 25rpx; position: absolute;
background-color: white; width: 95%;
// height: 160.68rpx; height: 150px;
display: flex; background-size: cover;
color: black; border-radius: 20rpx;
border-radius: 20rpx 20rpx 0 0; z-index: 0;
// width: ; }
.left { .zhezhao1 {
margin-right: 20rpx; width: 100%;
border-radius: 15rpx; height: 150px;
border-radius: 20rpx;
z-index: 1;
.title {
display: flex;
height: 50px;
align-items: center;
margin-left: 20px;
z-index: 1;
span {
background-color: #F84221;
color: white;
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;
}
}
.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; overflow: hidden;
text-overflow: ellipsis;
image {
width: 20px;
height: 20px;
margin-right: 10px;
}
} }
.rights { .text_three {
display: flex; width: 270px;
flex-direction: column; height: 30px;
justify-content: space-between; line-height: 30px;
padding-left: 10px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.first_li { image {
display: flex; width: 20px;
justify-content: space-between; height: 20px;
margin-right: 10px;
.type { }
border: 1px solid #3274F9; }
color: #3274F9;
padding: 0 10rpx;
border-radius: 10rpx;
} }
.pf { }
background-color: rgba(0, 0, 0, 0.3); }
color: white;
padding: 0 10rpx;
border-radius: 10rpx; }
.pro-box {
white-space: nowrap;
display: flex; display: flex;
align-items: center; 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;
} }
.hot { .price {
color: #F84221; 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 { .mer-item2 {
@ -1154,7 +1121,6 @@
} }
} }
} }
.guanbi { .guanbi {
width: 20px; width: 20px;
height: 20px; height: 20px;

348
pages/order_addcart/order_addcart.vue
View File

@ -1,19 +1,16 @@
<template> <template>
<view :style="viewColor"> <view :style="viewColor">
<view class='shoppingCart' :class="(newData.status && newData.status.status) ? 'showFoot' : ''"> <view class='shoppingCart' :class="(newData.status && newData.status.status) ? 'showFoot' : ''">
<view class='nav acea-row row-between-wrapper'>
<view>购物车 <text class='num'>({{cartTotalCount}})</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"
class='administrate acea-row row-center-wrapper' :class="footerswitch?'':'administratetxt'"
@click='manage'>{{ footerswitch ? '管理' : '退出管理'}}
</view>
</view>
<view class='labelNav acea-row row-around row-middle'> <view class='labelNav acea-row row-around row-middle'>
<view class='item'><text class='iconfont icon-xuanzhong' style="color:#3274F9"></text>100%正品保证</view> <view class='item'><text class='iconfont icon-xuanzhong'></text>100%正品保证</view>
<view class='item'><text class='iconfont icon-xuanzhong'></text>所有商品精挑细选</view> <view class='item'><text class='iconfont icon-xuanzhong'></text>所有商品精挑细选</view>
<view class='item'><text class='iconfont icon-xuanzhong'></text>售后无忧</view> <view class='item'><text class='iconfont icon-xuanzhong'></text>售后无忧</view>
</view> </view>
<view class='nav acea-row row-between-wrapper'>
<view>购物数量 <text class='num t-color'>{{cartTotalCount}}</text></view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0" class='administrate acea-row row-center-wrapper'
@click='manage'>{{ footerswitch ? '管理' : '取消'}}</view>
</view>
<view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0"> <view v-if="cartList.valid.length > 0 || cartList.invalid.length > 0">
<view class='list'> <view class='list'>
<block v-for="(item,index) in cartList.valid" :key="index"> <block v-for="(item,index) in cartList.valid" :key="index">
@ -23,60 +20,43 @@
<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text> <text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text> <text v-else class="iconfont icon-xuanzhong1"></text>
</view> </view>
<navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" <navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'" class="info">
class="info"> <text class="iconfont icon-shangjiadingdan"></text>
<!-- <text class="iconfont icon-shangjiadingdan"></text> -->
<view class="shop_title">
<image src="@/static/images/shop.png" mode="aspectFill"></image>
</view>
<view class="name">{{item.mer_name}}</view> <view class="name">{{item.mer_name}}</view>
<text class="iconfont icon-xiangyou"></text> <text class="iconfont icon-xiangyou"></text>
</navigator> </navigator>
<view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view> <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view>
</view> </view>
<navigator v-for="goods in item.list" :key="goods.cart_id" <navigator v-for="goods in item.list" :key="goods.cart_id" :url='"/pages/goods_details/index?id="+goods.product.product_id'
:url='"/pages/goods_details/index?id="+goods.product.product_id' hover-class='none' hover-class='none' class='picTxt acea-row'>
class='picTxt acea-row'>
<view class="checkbox" @click.stop="goodsCheck(goods,index)"> <view class="checkbox" @click.stop="goodsCheck(goods,index)">
<text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text> <text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text>
<text v-else class="iconfont icon-xuanzhong1"></text> <text v-else class="iconfont icon-xuanzhong1"></text>
</view> </view>
<view class='pictrue'> <view class='pictrue'>
<image :src='(goods.productAttr && goods.productAttr.image) || goods.product.image'> <image :src='(goods.productAttr && goods.productAttr.image) || goods.product.image'></image>
</image>
<!-- <image v-else :src='item.productInfo.image'></image> --> <!-- <image v-else :src='item.productInfo.image'></image> -->
</view> </view>
<view class='text'> <view class='text'>
<view class='line1'>{{goods.product.store_name}}</view> <view class='line1'>{{goods.product.store_name}}</view>
<view class='infor line1' v-if="goods.productAttr.sku" <view class='infor line1' v-if="goods.productAttr.sku" @click.stop='changeCart(goods,goods.cart_id)'>
@click.stop='changeCart(goods,goods.cart_id)'>
{{goods.productAttr.sku}} {{goods.productAttr.sku}}
<text class="iconfont icon-xiala1"></text> <text class="iconfont icon-xiala1"></text>
</view> </view>
<view v-if="goods.product.once_max_count>0 && goods.product.once_min_count>0" <view v-if="goods.product.once_max_count>0 && goods.product.once_min_count>0" class="buy_limit">
class="buy_limit"> <text v-if="goods.product.once_min_count>0">{{goods.product.once_min_count}}件起购，</text><text v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
<text
v-if="goods.product.once_min_count>0">{{goods.product.once_min_count}}件起购，</text><text
v-if="goods.product.once_max_count>0">最多{{goods.product.once_max_count}}件</text>
</view> </view>
<view class='money acea-row row-middle'> <view class='money acea-row row-middle'>
<text class='t-color'> <text>￥{{goods.productAttr.price}}</text>
<span>￥</span>
{{goods.productAttr.price.split('.')[0]}}</span>.<span
style="color: #F84221;">{{goods.productAttr.price.split('.')[1]}}</span>
</text>
<view v-if="goods.productAttr.show_svip_price" class="vipImg"> <view v-if="goods.productAttr.show_svip_price" class="vipImg">
<image src="/static/images/svip.png"></image> <image src="/static/images/svip.png"></image>
</view> </view>
</view> </view>
</view> </view>
<view class='carnum acea-row row-center-wrapper'> <view class='carnum acea-row row-center-wrapper'>
<view class="reduce" :class="goods.numSub ? 'on' : ''" @click.stop='subCart(goods)'> <view class="reduce" :class="goods.numSub ? 'on' : ''" @click.stop='subCart(goods)'>-</view>
-</view>
<view class='num'>{{goods.cart_num}}</view> <view class='num'>{{goods.cart_num}}</view>
<view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(goods)'>+ <view class="plus" :class="goods.numAdd ? 'on' : ''" @click.stop='addCart(goods)'>+</view>
</view>
</view> </view>
</navigator> </navigator>
</view> </view>
@ -84,18 +64,15 @@
</view> </view>
<view class='invalidGoods' v-if="cartList.invalid.length > 0"> <view class='invalidGoods' v-if="cartList.invalid.length > 0">
<view class='goodsNav acea-row row-between-wrapper'> <view class='goodsNav acea-row row-between-wrapper'>
<view @click='goodsOpen'><text class='iconfont' <view @click='goodsOpen'><text class='iconfont' :class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品</view>
:class='goodsHidden==true?"icon-xiangxia":"icon-xiangshang"'></text>失效商品</view>
<view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view> <view class='del' @click='unsetCart'><text class='iconfont icon-shanchu1'></text>清空</view>
</view> </view>
<view class='goodsList' :hidden='goodsHidden'> <view class='goodsList' :hidden='goodsHidden'>
<block v-for="(item,index) in cartList.invalid" :key='index'> <block v-for="(item,index) in cartList.invalid" :key='index'>
<navigator :url="'/pages/goods_details/index?id='+item.product_id" <navigator :url="'/pages/goods_details/index?id='+item.product_id" class='item acea-row row-between-wrapper' hover-class='none'>
class='item acea-row row-between-wrapper' hover-class='none'>
<view class='invalid'>失效</view> <view class='invalid'>失效</view>
<view class='pictrue'> <view class='pictrue'>
<image :src='(item.productAttr && item.productAttr.image) || item.product.image'> <image :src='(item.productAttr && item.productAttr.image) || item.product.image'></image>
</image>
</view> </view>
<view class='text acea-row row-column-between'> <view class='text acea-row row-column-between'>
@ -111,20 +88,17 @@
</view> </view>
</view> </view>
</view> </view>
<view class='noCart' v-if="recommend" <view class='noCart' v-if="recommend" :style="{marginTop:cartList.invalid.length ==0 && cartList.invalid.length ==0?'170rpx':'' }">
:style="{marginTop:cartList.invalid.length ==0 && cartList.invalid.length ==0?'170rpx':'' }">
<view class='pictrue'> <view class='pictrue'>
<image src='../../static/images/noCart.png'></image> <image src='../../static/images/noCart.png'></image>
<view>暂无商品，去添加点什么吧</view> <view>暂无商品，去添加点什么吧</view>
</view> </view>
<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend> <recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>
<view class='loadingicon acea-row row-center-wrapper' <view class='loadingicon acea-row row-center-wrapper' v-if="hostProduct.length>5 && recommend_switch == 1">
v-if="hostProduct.length>5 && recommend_switch == 1">
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}} <text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view> </view>
</view> </view>
<view class='footer acea-row row-between-wrapper' :class="isFooter?'':'on'" <view class='footer acea-row row-between-wrapper' :class="isFooter?'':'on'" v-if="cartList.valid.length > 0">
v-if="cartList.valid.length > 0">
<view> <view>
<view class="allcheckbox" @click.stop="checkboxAllChange"> <view class="allcheckbox" @click.stop="checkboxAllChange">
<text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text> <text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text>
@ -133,18 +107,14 @@
</view> </view>
</view> </view>
<view class='money acea-row row-middle' v-if="footerswitch==true"> <view class='money acea-row row-middle' v-if="footerswitch==true">
<text class='t-colora'>合计：</text> <text class='t-color'>￥{{selectCountPrice}}</text>
<!-- selectCountPrice -->
<text class='t-color'><span>￥</span>
<span style="font-size:44rpx;">{{selectCountPrice.toFixed(2).split('.')[0]}}</span>.<span
style="color: #F84221;">{{selectCountPrice.toFixed(2).split('.')[1]}}</span></text>
<form @submit="subOrder" report-submit='true'> <form @submit="subOrder" report-submit='true'>
<button class='placeOrder' formType="submit">去结算</button> <button class='placeOrder' formType="submit">去结算</button>
</form> </form>
</view> </view>
<view class='button acea-row row-middle' v-else> <view class='button acea-row row-middle' v-else>
<form @submit="subCollect" report-submit='true'> <form @submit="subCollect" report-submit='true'>
<button class='bnt bt-color' formType="submit">移至收藏</button> <button class='bnt bt-color' formType="submit">收藏</button>
</form> </form>
<form @submit="subDel" report-submit='true'> <form @submit="subDel" report-submit='true'>
<button class='bnt' formType="submit">删除</button> <button class='bnt' formType="submit">删除</button>
@ -154,16 +124,19 @@
</view> </view>
<!-- 优惠券弹窗 --> <!-- 优惠券弹窗 -->
<block v-if="coupon.coupon"> <block v-if="coupon.coupon">
<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" <couponListWindow
@ChangCouponsUseState="ChangCouponsUseState"></couponListWindow> :coupon='coupon'
@ChangCouponsClone="ChangCouponsClone"
@ChangCouponsUseState="ChangCouponsUseState"
></couponListWindow>
</block> </block>
<!-- 组件 --> <!-- 组件 -->
<addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" <addcartWindow :attr="attr" :isShow='1' :iSplus='1' :destri='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr" @goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
@goCat="goCat" @attrVal="attrVal" id='product-window'></addcartWindow>
<authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize> <authorize :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" @onLoadFun="onLoadFun"></authorize>
<view class="foot" v-if="newData.status && newData.status.status"> <view class="foot" v-if="newData.status && newData.status.status">
<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}"> <view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index" @click="goRouter(item)"> <view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
@click="goRouter(item)">
<block v-if="item.link == activeRouter"> <block v-if="item.link == activeRouter">
<image :src="item.imgList[0]"></image> <image :src="item.imgList[0]"></image>
<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}} <view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
@ -210,9 +183,7 @@
} from "vuex"; } from "vuex";
import recommend from '@/components/recommend'; import recommend from '@/components/recommend';
import authorize from '@/components/Authorize'; import authorize from '@/components/Authorize';
import { import { configMap } from '@/utils';
configMap
} from '@/utils';
const app = getApp(); const app = getApp();
export default { export default {
props: { props: {
@ -277,11 +248,7 @@
activeRouter: '', activeRouter: '',
}; };
}, },
computed: configMap({ computed: configMap({hide_mer_status: 1,recommend_switch:0,navigation: {}}, mapGetters(['isLogin','viewColor'])),
hide_mer_status: 1,
recommend_switch: 0,
navigation: {}
}, mapGetters(['isLogin', 'viewColor'])),
onReady(){}, onReady(){},
mounted: function() {}, mounted: function() {},
onLoad: function(options) { onLoad: function(options) {
@ -317,7 +284,7 @@
methods: { methods: {
// 授权关闭 // 授权关闭
authColse: function(e) { authColse: function(e) {
// console.log(e,'authColse') console.log(e,'authColse')
this.isShowAuth = e; this.isShowAuth = e;
}, },
onLoadFun(){ onLoadFun(){
@ -446,7 +413,7 @@
let productAttr = this.attr.productAttr; let productAttr = this.attr.productAttr;
let value = []; let value = [];
let arr = [] let arr = []
// console.log(arr, 'arr') console.log(arr, 'arr')
if(this.currSku){ if(this.currSku){
value = this.currSku value = this.currSku
}else{ }else{
@ -467,8 +434,7 @@
"store_name", "store_name",
goods.product.store_name goods.product.store_name
); );
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product.image);
.product.image);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "stock", productSelect.stock);
this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "unique", productSelect.unique);
@ -547,8 +513,7 @@
} }
}, },
attrVal(val) { attrVal(val) {
this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val.indexn]);
.indexn]);
}, },
/** /**
* 属性变动赋值 * 属性变动赋值
@ -560,17 +525,16 @@
this.newVal = this.productValue[res]; this.newVal = this.productValue[res];
if(productSelect)this.$set(this, "uniqueValue", productSelect.unique); if(productSelect)this.$set(this, "uniqueValue", productSelect.unique);
if (productSelect && productSelect.stock > 0) { if (productSelect && productSelect.stock > 0) {
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage);
.attrImage);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", productSelect.stock); this.$set(this.attr.productSelect, "stock", productSelect.stock);
this.$set(this.attr.productSelect, "unique", productSelect.unique); this.$set(this.attr.productSelect, "unique", productSelect.unique);
this.$set(this, "uniqueValue", productSelect.unique); this.$set(this, "uniqueValue", productSelect.unique);
this.$set(this.attr.productSelect, "cart_num", 1); this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", res); this.$set(this, "attrValue", res);
} else { }
this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this else {
.attrImage); this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", 0); this.$set(this.attr.productSelect, "stock", 0);
this.$set(this.attr.productSelect, "unique", ""); this.$set(this.attr.productSelect, "unique", "");
@ -629,8 +593,7 @@
cart_num: that.goods.cart_num, cart_num: that.goods.cart_num,
product_attr_unique: that.newVal.unique product_attr_unique: that.newVal.unique
}).then(res => { }).then(res => {
if (that.goods.hasOwnProperty('productAttr') && that.goods.cart_num > that.goods if (that.goods.hasOwnProperty('productAttr') && that.goods.cart_num > that.goods.productAttr.stock) {
.productAttr.stock) {
that.goods.cart_num = that.goods.productAttr.stock; that.goods.cart_num = that.goods.productAttr.stock;
that.goods.numAdd = true; that.goods.numAdd = true;
that.goods.numSub = false; that.goods.numSub = false;
@ -769,8 +732,7 @@
// 总金额 //总数 // 总金额 //总数
el.list.forEach(e => { el.list.forEach(e => {
if (e.check) { if (e.check) {
totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.price, e.cart_num))
.price, e.cart_num))
totalNum += e.cart_num totalNum += e.cart_num
} }
}) })
@ -816,8 +778,7 @@
}, },
// 清空 // 清空
unsetCart: function() { unsetCart: function() {
let that = this, let that = this,ids = [];
ids = [];
for (let i = 0, len = that.cartList.invalid.length; i < len; i++) { for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
ids.push(that.cartList.invalid[i].cart_id); ids.push(that.cartList.invalid[i].cart_id);
} }
@ -849,9 +810,7 @@
ids:ids.join(',') ids:ids.join(',')
}).then(res => { }).then(res => {
goodsArr = res.data goodsArr = res.data
getShopCoupons(item.mer_id).then(({ getShopCoupons(item.mer_id).then(({data})=>{
data
}) => {
uni.hideLoading(); uni.hideLoading();
couponList = goodsArr.concat(data) couponList = goodsArr.concat(data)
this.$set(this.coupon, 'list', couponList); this.$set(this.coupon, 'list', couponList);
@ -865,7 +824,7 @@
ChangCouponsUseState(index) { ChangCouponsUseState(index) {
let that = this; let that = this;
that.coupon.list[index].issue = true; that.coupon.list[index].issue = true;
// console.log(that.coupon.list[index]) console.log(that.coupon.list[index])
}, },
}, },
onReachBottom() { onReachBottom() {
@ -882,46 +841,30 @@
<style scoped lang="scss"> <style scoped lang="scss">
.shoppingCart .labelNav { .shoppingCart .labelNav {
height: 76rpx; height: 76rpx;
// padding: 0 30rpx; padding: 0 30rpx;
line-height: 76rpx; font-size: 22rpx;
font-size: 26rpx; color: #8c8c8c;
font-weight: 400;
color: #3274F9;
position: fixed; position: fixed;
left: 0; left: 0;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
background-color: #f5f5f5; background-color: #f5f5f5;
z-index: 5; z-index: 5;
top: 86rpx; top: 0;
} }
.icon-xiala1{ .icon-xiala1{
display: inline-block; display: inline-block;
transform: rotate(180deg); transform: rotate(180deg);
font-size: 14rpx; font-size: 14rpx;
padding: 0 5rpx; padding: 0 5rpx;
} }
.shoppingCart .labelNav .item .iconfont { .shoppingCart .labelNav .item .iconfont {
font-size: 25rpx; font-size: 25rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.t-color { .t-color {
color: var(--view-theme); color: var(--view-theme);
span {
font-size: 23rpx;
} }
}
.t-colora {
font-size: 26rpx;
color: #333333;
font-weight: 400;
}
.shoppingCart { .shoppingCart {
/* #ifndef MP */ /* #ifndef MP */
padding-bottom: 180rpx; padding-bottom: 180rpx;
@ -929,7 +872,6 @@
/* #ifdef MP */ /* #ifdef MP */
padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom)); padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom));
padding-bottom: calc(0rpx + env(safe-area-inset-bottom)); padding-bottom: calc(0rpx + env(safe-area-inset-bottom));
/* #endif */ /* #endif */
&.showFoot{ &.showFoot{
padding-bottom: calc(180rpx+ constant(safe-area-inset-bottom)); padding-bottom: calc(180rpx+ constant(safe-area-inset-bottom));
@ -937,7 +879,6 @@
} }
} }
.shoppingCart .nav { .shoppingCart .nav {
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;
@ -949,109 +890,76 @@
position: fixed; position: fixed;
left: 0; left: 0;
z-index: 5; z-index: 5;
top: 0rpx; top: 76rpx;
} }
.shoppingCart .nav .administrate { .shoppingCart .nav .administrate {
font-size: 30rpx; font-size: 26rpx;
font-weight: 400; color: #282828;
color: #333333; width: 110rpx;
height: 46rpx; height: 46rpx;
// border-radius: 6rpx; border-radius: 6rpx;
// border: 1px solid #868686; border: 1px solid #868686;
} }
.administratetxt {
color: #3274F9 !important;
}
.shoppingCart .noCart { .shoppingCart .noCart {
margin-top: 20rpx; margin-top: 20rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
background-color: #fff; background-color: #fff;
padding-top: 0.1rpx; padding-top: 0.1rpx;
} }
.shoppingCart .noCart .pictrue { .shoppingCart .noCart .pictrue {
text-align: center; text-align: center;
margin: 78rpx auto 56rpx auto; margin: 78rpx auto 56rpx auto;
padding-bottom: 60rpx; padding-bottom: 60rpx;
} }
.shoppingCart .noCart .pictrue image { .shoppingCart .noCart .pictrue image {
width: 414rpx; width: 414rpx;
height: 305rpx; height: 305rpx;
} }
.shoppingCart .noCart .pictrue view{ .shoppingCart .noCart .pictrue view{
color: #999; color: #999;
} }
.shoppingCart .list { .shoppingCart .list {
margin: 171rpx 0 20rpx; margin: 171rpx 0 20rpx;
} }
.shoppingCart .list .item { .shoppingCart .list .item {
background-color: #fff; background-color: #fff;
margin-bottom: 15rpx; margin-bottom: 15rpx;
.store-title { .store-title {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
padding: 0 30rpx; padding: 0 30rpx;
height: 85rpx; height: 85rpx;
border-bottom: 1px solid #f0f0f0;
.checkbox { .checkbox {
width: 60rpx; width: 60rpx;
.iconfont { .iconfont {
font-size: 40rpx; font-size: 40rpx;
color: #CCCCCC; color: #CCCCCC;
} }
.icon-xuanzhong1 { .icon-xuanzhong1 {
color: var(--view-theme); color: var(--view-theme);
} }
} }
.info { .info {
flex: 1; flex: 1;
display: flex; display: flex;
align-items: center; align-items: center;
.iconfont { .iconfont {
font-size: 36rpx; font-size: 36rpx;
} }
.shop_title {
width: 52rpx;
height: 52rpx;
image {
width: 100%;
height: 100%;
}
}
.name { .name {
margin: 0 0 0 10rpx; margin: 0 0 0 10rpx;
font-size: 30rpx; font-size: 28rpx;
font-weight: 400; color: #282828;
color: #333333; font-weight: bold;
} }
.icon-xiangyou { .icon-xiangyou {
margin-top: 6rpx; margin-top: 6rpx;
font-size: 32rpx; font-size: 22rpx;
color: #333; color: #999;
} }
} }
.coupon-btn { .coupon-btn {
color: var(--view-theme); color: var(--view-theme);
font-size: 22rpx; font-size: 22rpx;
@ -1063,64 +971,53 @@
} }
} }
} }
.vipImg { .vipImg {
width: 65rpx; width: 65rpx;
height: 28rpx; height: 28rpx;
margin-left: 10rpx; margin-left: 10rpx;
image { image {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
} }
} }
.shoppingCart .list .item .picTxt { .shoppingCart .list .item .picTxt {
width: 100%; width: 100%;
padding: 25rpx 30rpx; padding: 25rpx 30rpx;
position: relative; position: relative;
align-items: center; align-items: center;
border-bottom: 1px solid #f0f0f0; border-bottom: 1px solid #f0f0f0;
.checkbox { .checkbox {
width: 60rpx; width: 60rpx;
.iconfont { .iconfont {
font-size: 40rpx; font-size: 40rpx;
color: #CCCCCC; color: #CCCCCC;
} }
.icon-xuanzhong1 { .icon-xuanzhong1 {
color: var(--view-theme); color: var(--view-theme);
} }
} }
} }
.shoppingCart .list .item .picTxt .pictrue { .shoppingCart .list .item .picTxt .pictrue {
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
} }
.shoppingCart .list .item .picTxt .pictrue image { .shoppingCart .list .item .picTxt .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 6rpx; border-radius: 6rpx;
} }
.shoppingCart .list .item .picTxt .text { .shoppingCart .list .item .picTxt .text {
width: 444rpx; width: 444rpx;
margin-left: 20rpx; margin-left: 20rpx;
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
} }
.shoppingCart .list .item .picTxt .buy_limit { .shoppingCart .list .item .picTxt .buy_limit {
margin-top: 10rpx; margin-top: 10rpx;
color: #E93323; color: #E93323;
font-size: 22rpx; font-size: 22rpx;
} }
.shoppingCart .list .item .picTxt .text .infor { .shoppingCart .list .item .picTxt .text .infor {
display: inline-block; display: inline-block;
padding: 6rpx; padding: 6rpx;
@ -1131,63 +1028,44 @@
background-color: #F5F5F5; background-color: #F5F5F5;
max-width: 460rpx; max-width: 460rpx;
} }
.shoppingCart .list .item .picTxt .text .money { .shoppingCart .list .item .picTxt .text .money {
font-size: 32rpx; font-size: 32rpx;
color: #282828; color: #282828;
margin-top: 28rpx; margin-top: 28rpx;
} }
.shoppingCart .list .item .picTxt .carnum { .shoppingCart .list .item .picTxt .carnum {
height: 42rpx; height: 47rpx;
position: absolute; position: absolute;
bottom: 30rpx; bottom: 30rpx;
right: 30rpx; right: 30rpx;
} }
.shoppingCart .list .item .picTxt .carnum view { .shoppingCart .list .item .picTxt .carnum view {
border: 1px solid #a4a4a4;
min-width: 44rpx; min-width: 66rpx;
text-align: center; text-align: center;
height: 100%; height: 100%;
line-height: 35rpx; line-height: 46rpx;
font-size: 28rpx; font-size: 28rpx;
font-weight: 400;
color: #333333;
color: #a4a4a4; color: #a4a4a4;
} }
.shoppingCart .list .item .picTxt .carnum .reduce { .shoppingCart .list .item .picTxt .carnum .reduce {
// border-right: 0; border-right: 0;
border-radius: 7rpx 0 0 7rpx; border-radius: 3rpx 0 0 3rpx;
border: 1px solid #B3CBFC;
} }
.shoppingCart .list .item .picTxt .carnum .reduce.on { .shoppingCart .list .item .picTxt .carnum .reduce.on {
// border-color: #e3e3e3; border-color: #e3e3e3;
// color: #dedede; color: #dedede;
border-radius: 7rpx 0 0 7rpx;
border: 1px solid #B3CBFC;
} }
.shoppingCart .list .item .picTxt .carnum .plus { .shoppingCart .list .item .picTxt .carnum .plus {
border-left: 0;
border-radius: 7rpx 0 0 7rpx; border-radius: 0 3rpx 3rpx 0;
border: 1px solid #B3CBFC;
} }
.shoppingCart .list .item .picTxt .carnum .num { .shoppingCart .list .item .picTxt .carnum .num {
width: 63rpx; color: #282828;
font-size: 26rpx;
font-weight: 400;
color: #333333;
padding-top: 5rpx;
} }
.shoppingCart .invalidGoods { .shoppingCart .invalidGoods {
background-color: #fff; background-color: #fff;
} }
.shoppingCart .invalidGoods .goodsNav { .shoppingCart .invalidGoods .goodsNav {
width: 100%; width: 100%;
height: 66rpx; height: 66rpx;
@ -1196,30 +1074,25 @@
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
} }
.shoppingCart .invalidGoods .goodsNav .iconfont { .shoppingCart .invalidGoods .goodsNav .iconfont {
color: #424242; color: #424242;
font-size: 28rpx; font-size: 28rpx;
margin-right: 17rpx; margin-right: 17rpx;
} }
.shoppingCart .invalidGoods .goodsNav .del { .shoppingCart .invalidGoods .goodsNav .del {
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
} }
.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 { .shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
color: #999; color: #999;
font-size: 33rpx; font-size: 33rpx;
vertical-align: -2rpx; vertical-align: -2rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
.shoppingCart .invalidGoods .goodsList .item { .shoppingCart .invalidGoods .goodsList .item {
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
border-top: 1px solid #f5f5f5; border-top: 1px solid #f5f5f5;
} }
.shoppingCart .invalidGoods .goodsList .item .invalid { .shoppingCart .invalidGoods .goodsList .item .invalid {
font-size: 22rpx; font-size: 22rpx;
color: #fff; color: #fff;
@ -1230,123 +1103,98 @@
text-align: center; text-align: center;
line-height: 36rpx; line-height: 36rpx;
} }
.shoppingCart .invalidGoods .goodsList .item .pictrue { .shoppingCart .invalidGoods .goodsList .item .pictrue {
width: 140rpx; width: 140rpx;
height: 140rpx; height: 140rpx;
} }
.shoppingCart .invalidGoods .goodsList .item .pictrue image { .shoppingCart .invalidGoods .goodsList .item .pictrue image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 6rpx; border-radius: 6rpx;
} }
.shoppingCart .invalidGoods .goodsList .item .text { .shoppingCart .invalidGoods .goodsList .item .text {
width: 433rpx; width: 433rpx;
font-size: 28rpx; font-size: 28rpx;
color: #999; color: #999;
height: 140rpx; height: 140rpx;
} }
.shoppingCart .invalidGoods .goodsList .item .text .name { .shoppingCart .invalidGoods .goodsList .item .text .name {
width: 100%; width: 100%;
} }
.shoppingCart .invalidGoods .goodsList .item .text .infor { .shoppingCart .invalidGoods .goodsList .item .text .infor {
font-size: 24rpx; font-size: 24rpx;
} }
.shoppingCart .invalidGoods .goodsList .item .text .end { .shoppingCart .invalidGoods .goodsList .item .text .end {
font-size: 26rpx; font-size: 26rpx;
color: #bbb; color: #bbb;
} }
.shoppingCart .footer { .shoppingCart .footer {
z-index: 9; z-index: 9;
width: 100%; width: 100%;
height: 195rpx; height: 96rpx;
background-color: #fafafa;
background: #FFFFFF;
box-shadow: 0px -5px 18px 2px rgba(233, 240, 254, 1);
border-radius: 32px 32px 0px 0px;
position: fixed; position: fixed;
padding: 0 30rpx; padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
border-top: 1px solid #eee; border-top: 1px solid #eee;
bottom: 0; bottom: 98rpx;
bottom: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
} }
.shoppingCart .footer.on { .shoppingCart .footer.on {
// #ifndef H5 // #ifndef H5
bottom: 0rpx; bottom: 0rpx;
// #endif // #endif
} }
.shoppingCart .footer .checkAll { .shoppingCart .footer .checkAll {
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
margin-left: 16rpx; margin-left: 16rpx;
} }
.shoppingCart .footer .money { .shoppingCart .footer .money {
font-size: 30rpx; font-size: 30rpx;
} }
.shoppingCart .footer .placeOrder { .shoppingCart .footer .placeOrder {
color: #fff; color: #fff;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; width: 226rpx;
width: 217rpx; height: 70rpx;
height: 84rpx; border-radius: 50rpx;
border-radius: 42rpx;
text-align: center; text-align: center;
line-height: 84rpx; line-height: 70rpx;
margin-left: 22rpx; margin-left: 22rpx;
// background-color: var(--view-theme); background-color: var(--view-theme);
background: linear-gradient(270deg, #6DD5FA 0%, #3274F9 100%);
} }
.shoppingCart .footer .button .bnt { .shoppingCart .footer .button .bnt {
font-size: 30rpx; font-size: 28rpx;
font-weight: 500; color: #999;
color: #FFFFFF; border-radius: 50rpx;
background: #B3B3B3; border: 1px solid #999;
border-radius: 42rpx 42rpx 42rpx 42rpx; width: 160rpx;
// border: 1px solid #999; height: 60rpx;
width: 189rpx;
height: 84rpx;
text-align: center; text-align: center;
line-height: 84rpx; line-height: 60rpx;
&.bt-color { &.bt-color {
// color: var(--view-theme); color: var(--view-theme);
// border: 1px solid var(--view-theme); border: 1px solid var(--view-theme);
background: linear-gradient(270deg, #6DD5FA 0%, #3274F9 100%);
} }
} }
.shoppingCart .footer .button form~form { .shoppingCart .footer .button form~form {
margin-left: 17rpx; margin-left: 17rpx;
} }
.allcheckbox { .allcheckbox {
display: flex; display: flex;
align-items: center; align-items: center;
width: 260rpx;
.iconfont { .iconfont {
margin-right: 20rpx; margin-right: 20rpx;
font-size: 40rpx; font-size: 40rpx;
color: #CCCCCC; color: #CCCCCC;
} }
.icon-xuanzhong1 { .icon-xuanzhong1 {
color: var(--view-theme); color: var(--view-theme);
} }
} }
.page-footer { .page-footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -1363,11 +1211,9 @@
box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32); box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/ padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/ padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
&.filter{ &.filter{
filter: blur(2rpx); filter: blur(2rpx);
} }
.foot-item { .foot-item {
display: flex; display: flex;
width: max-content; width: max-content;
@ -1375,7 +1221,6 @@
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
.count-num { .count-num {
position: absolute; position: absolute;
display: flex; display: flex;
@ -1392,16 +1237,15 @@
padding: 4rpx; padding: 4rpx;
} }
} }
.foot-item image { .foot-item image {
height: 50rpx; height: 50rpx;
width: 50rpx; width: 50rpx;
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
} }
.foot-item .txt { .foot-item .txt {
font-size: 24rpx; font-size: 24rpx;
} }
} }
</style> </style>

62
pages/order_details/index.vue
View File

@ -305,9 +305,17 @@
<navigator v-if="orderInfo.delivery_type == 1 || orderInfo.delivery_type == 4" class='bnt cancel' <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">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.order_id">查看物流
</navigator> </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>
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-else>取件码</view> <view class='bnt b-color' @tap='confirmOrderb(orderInfo)' v-else>确认收货
</view>
</view>
<view class='bnt b-color' @tap='confirmOrder(orderInfo)' v-if="orderInfo.activity_type==0">取件码</view>
</block> </block>
<block v-if="orderInfo.status == 2"> <block v-if="orderInfo.status == 2">
<view class="bnt cancel" @click="allRefund" <view class="bnt cancel" @click="allRefund"
@ -913,30 +921,35 @@
}); });
}, },
//收货弹窗 //收货弹窗
confirmOrder: function(item) { confirmOrdera: function(item) {
this.receivingshow = true this.receivingshow = true
}, },
queding() { confirmOrderb: function(item) {
if (orderInfo.activity_type == 98) {
let that = this; let that = this;
orderTake(that.order_id).then(res => { uni.showModal({
this.receivingshow = false title: '确认收货',
content: '为保障权益，请收到货确认无误后，再确认收货',
success: function(res) {
if (res.confirm) {
orderTake(item.order_id).then(res => {
return that.$util.Tips({ return that.$util.Tips({
title: '成功收货', title: '操作成功',
icon: 'success' icon: 'success'
}, function() { }, function() {
that.orderList.splice(index, 1);
that.getOrderInfo(); that.getOrderData();
}); });
}).catch(err => { }).catch(err => {
this.receivingshow = false
return that.$util.Tips({ return that.$util.Tips({
title: err title: err
}); });
}) })
} else { }
}
})
},
confirmOrder: function(item) {
uni.showModal({ uni.showModal({
title: '取件码', title: '取件码',
content: item.logistics_code, content: item.logistics_code,
@ -948,7 +961,28 @@
} }
} }
}) })
}
},
queding() {
let that = this;
orderTake(that.order_id).then(res => {
this.receivingshow = false
that.getOrderInfo();
return that.$util.Tips({
title: '成功收货',
icon: 'success'
}, function() {
});
}).catch(err => {
this.receivingshow = false
return that.$util.Tips({
title: err
});
})
}, },

6
pages/plantGrass/plant_release/index.vue
View File

@ -12,7 +12,7 @@
<view class="release_item"> <view class="release_item">
<view class="photo_count"> <view class="photo_count">
<view class="input_photo acea-row row-middle"> <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"> <view class="pictrue" v-if="formData.video_link">
<image class="video-bg" mode="widthFix" src="../static/images/video_bg.png"></image> <image class="video-bg" mode="widthFix" src="../static/images/video_bg.png"></image>
<view class="videoHover" @click="videoshow"> <view class="videoHover" @click="videoshow">
@ -27,7 +27,7 @@
<view><text class='iconfont icon-tianjiashipin'></text></view> <view><text class='iconfont icon-tianjiashipin'></text></view>
<view class="text">添加视频</view> <view class="text">添加视频</view>
</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><text class='iconfont icon-fengmian'></text></view>
<view class="text">添加封面</view> <view class="text">添加封面</view>
</view> </view>
@ -37,7 +37,7 @@
<text class="cover_text" v-if="tabActive == 2">封面</text> <text class="cover_text" v-if="tabActive == 2">封面</text>
<view class="close_btn" @click="DelPic(index)"><text class="iconfont icon-guanbi4"></text></view> <view class="close_btn" @click="DelPic(index)"><text class="iconfont icon-guanbi4"></text></view>
</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 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><text class='iconfont icon-icon25201'></text></view>
<view class="text">添加图片</view> <view class="text">添加图片</view>

44
pages/store/applicationRecord/index.vue
View File

@ -5,18 +5,14 @@
<view class="card-top"> <view class="card-top">
<view class="title">{{item.mer_name}}</view> <view class="title">{{item.mer_name}}</view>
<view class="time">提交时间：{{item.create_time}}</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>
<view class="line"></view> <view class="line"></view>
<view class="card-bottom"> <view class="card-bottom">
<view class="card-status"> <view class="card-status">
<image class="status-icon" v-if="item.status === 0" src="../../../static/images/SJRZ/DSH.png" <image class="status-icon" v-if="item.status === 0" src="../static/images/pending.png" mode=""></image>
mode=""> <image class="status-icon" v-else-if="item.status === 1" src="../static/images/passed.png" mode=""></image>
</image> <image class="status-icon" v-else-if="item.status === 2" src="../static/images/not-pass.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>
<text class="status-text">{{statusText(item.status)}}</text> <text class="status-text">{{statusText(item.status)}}</text>
</view> </view>
<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view> <view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
@ -87,17 +83,16 @@
}, },
// 跳转逻辑 // 跳转逻辑
jump(item) { jump(item) {
if ([0, 2].includes(item.status)) {
console.log(item) console.log(item)
if ([0, 2].includes(item.status)) {
uni.navigateTo({ 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) { } else if (item.status === 1) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}` url: `/pages/store/merchantDetails/index?mer_i_id=${item.mer_intention_id}&mer_id=${item.mer_id}`
}) })
} }
}, },
//状态判断 //状态判断
statusText(number) { statusText(number) {
@ -113,9 +108,9 @@
statusBtn(number) { statusBtn(number) {
// 使用对象 // 使用对象
let statusData = { let statusData = {
0: "", 0: "编辑",
1: "查看详情", 1: "查看",
2: "查看详情", 2: "重新提交",
}; };
return statusData[number] return statusData[number]
}, },
@ -130,87 +125,72 @@
align-items: center; align-items: center;
background-color: #F5F5F5; background-color: #F5F5F5;
padding: 20rpx 30rpx; padding: 20rpx 30rpx;
.card-list { .card-list {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
padding: 20rpx 24rpx; padding: 20rpx 24rpx;
margin: 10rpx 20rpx; margin: 10rpx 20rpx;
border-radius: 12rpx; border-radius: 12rpx;
.card-top { .card-top {
height: 140rpx; height: 140rpx;
.title { .title {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.time { .time {
color: #999999; color: #999999;
font-size: 24rpx; font-size: 24rpx;
padding: 5rpx 0; padding: 5rpx 0;
margin-top: 10rpx;
} }
.reason { .reason {
color: #E93323; color: #E93323;
font-weight: bold; font-weight: bold;
font-size: 24rpx; font-size: 24rpx;
} }
} }
.line { .line {
height: 2rpx; height: 2rpx;
margin: 20rpx 0 20rpx 0; margin: 20rpx 0 20rpx 0;
background-color: #EEEEEE; background-color: #EEEEEE;
} }
.card-bottom { .card-bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
color: #333; color: #333;
.card-status { .card-status {
display: flex; display: flex;
align-items: center; align-items: center;
.status-icon { .status-icon {
width: 50.82rpx; width: 30rpx;
height: 50.82rpx; height: 30rpx;
margin: 10rpx; margin: 10rpx;
} }
.status-text { .status-text {
font-size: 28rpx; font-size: 28rpx;
font-weight: 500; font-weight: 500;
} }
} }
.status-btn { .status-btn {
font-size: 26rpx; font-size: 26rpx;
color: #555; color: #555;
border: 1px solid #729FFA; border: 1px solid #999999;
padding: 8rpx 32rpx; padding: 8rpx 32rpx;
border-radius: 40rpx; border-radius: 40rpx;
} }
} }
} }
} }
.no-shop { .no-shop {
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
height: 100vh; height: 100vh;
.pictrue { .pictrue {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
color: $uni-nothing-text; color: $uni-nothing-text;
image { image {
width: 414rpx; width: 414rpx;
height: 380rpx; height: 380rpx;

77
pages/store/settled/index.vue
View File

@ -1,25 +1,14 @@
<template> <template>
<view v-if="!successful"> <view v-if="!successful" :style="viewColor">
<view style="height: var(--status-bar-height);background-color: #69D0F9;"></view>
<form report-submit='true'> <form report-submit='true'>
<view class='merchantsSettled'> <view class='merchantsSettled'>
<view class="merchantBgCount"> <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>
<view class="application-record" @click="jumpToList">
<view class="application-record"> 申请记录
<u--image :showLoading="true" src="../../../static/images/SJRZ/FH.png" width="28" height="28rpx" <text class="iconfont icon-xiangyou"></text>
@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> </view>
<view class='list'> <view class='list'>
<view class="item"> <view class="item">
@ -70,7 +59,7 @@
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <view class="uni-list-cell-db acea-row row-middle">
<text class="item-name">商户分类</text> <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"> range-key="category_name">
<input placeholder="请选择商户分类" type="text" readonly disabled <input placeholder="请选择商户分类" type="text" readonly disabled
v-model="mer_classification"> v-model="mer_classification">
@ -143,8 +132,7 @@
</checkbox-group> </checkbox-group>
<button class="settleAgree" @click="getConfig">《入驻协议》</button> <button class="settleAgree" @click="getConfig">《入驻协议》</button>
</view> </view>
<button class='submitBtn' :style="validate === true ? 'background:#3274F9':''" <button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
@click="formSubmit">提交申请</button>
</view> </view>
</view> </view>
</form> </form>
@ -313,9 +301,6 @@
onShow() {}, onShow() {},
onReady() {}, onReady() {},
methods: { methods: {
goBack() {
uni.navigateBack()
},
//是否是农贸市场 //是否是农贸市场
// change(e) { // change(e) {
// this.isnum = (e === true ? 1 : 0) // this.isnum = (e === true ? 1 : 0)
@ -382,7 +367,7 @@
// 获取历史提交数据详情 // 获取历史提交数据详情
getGoodsDetails(id) { getGoodsDetails(id) {
getGoodsDetails(id).then(res => { getGoodsDetails(id).then(res => {
// console.log(res); console.log(res);
let arr = Object.keys(this.merchantData) let arr = Object.keys(this.merchantData)
let resData = res.data let resData = res.data
arr.map(item => { arr.map(item => {
@ -426,7 +411,7 @@
this.validateBtn() this.validateBtn()
}, },
bindPickerChange1: function(e) { bindPickerChange1: function(e) {
// console.log(e); console.log(e);
this.index1 = e.target.value this.index1 = e.target.value
let idx = e.target.value let idx = e.target.value
this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id'] this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
@ -458,7 +443,7 @@
getStoreType: function() { getStoreType: function() {
getStoreTypeApi() getStoreTypeApi()
.then(res => { .then(res => {
// console.log(res); console.log(res);
this.storeTypeArr = res.data this.storeTypeArr = res.data
}) })
.catch(res => { .catch(res => {
@ -739,9 +724,9 @@
<style scoped lang="scss"> <style scoped lang="scss">
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked, /deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked { /deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
border: 1px solid #3274F9 !important; border: 1px solid var(--view-theme) !important;
background-color: #3274F9 !important; background-color: var(--view-theme) !important;
color: white !important; color: #fff !important;
} }
.uni-input-placeholder { .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 { .merchantBgCount {
line-height: 0; line-height: 0;
} }
@ -806,23 +779,14 @@
} }
.application-record { .application-record {
height: 40rpx;
position: absolute; position: absolute;
display: flex; display: flex;
align-items: center; align-items: center;
width: 100vw; top: 240rpx;
display: flex;
justify-content: space-between;
top: 40rpx;
right: 0; right: 0;
/* #ifdef APP-PLUS */
top: var(--status-bar-height);
/* #endif */
color: #fff; color: #fff;
font-size: 22rpx; 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; padding: 8rpx 18rpx;
border-radius: 20px 0px 0px 20px; border-radius: 20px 0px 0px 20px;
} }
@ -1032,10 +996,9 @@
position: absolute; position: absolute;
width: 93px; width: 93px;
line-height: 27px; line-height: 27px;
border: 1px solid #3274F9; border: 1px solid var(--view-theme);
border-radius: 15px; border-radius: 15px;
color: #3274F9; color: var(--view-theme);
// color: $primary-color;
text-align: center; text-align: center;
bottom: 8px; bottom: 8px;
right: 0; right: 0;
@ -1059,7 +1022,7 @@
color: #fff; color: #fff;
background: #E3E3E3; background: #E3E3E3;
margin-top: 25px; margin-top: 25px;
// pointer-events: none; pointer-events: none;
} }
.merchantsSettled .submitBtn.on { .merchantsSettled .submitBtn.on {
@ -1278,6 +1241,4 @@
} }
} }
.my-picker {}
</style> </style>

4
pages/users/order_confirm/index.vue
View File

@ -164,13 +164,13 @@
<view class='discount'>暂无优惠券</view> <view class='discount'>暂无优惠券</view>
</block> </block>
</view> </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>开具发票 <text @tap="showInvoice" class="iconfont icon-wenhao1"></text></view>
<view class='discount discount_voice' @tap="goInvoice(item.mer_id)"> <view class='discount discount_voice' @tap="goInvoice(item.mer_id)">
{{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}} {{(item.invoiceData && item.invoiceData.receipt_title) ? item.invoiceData.receipt_title : '不开发票'}}
<text class='iconfont icon-jiantou'></text> <text class='iconfont icon-jiantou'></text>
</view> </view>
</view> </view> -->
<view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2" <view v-if="order_type === 2 && item.list[0].productPresell.presell_type ==2"
class="item acea-row row-between-wrapper" class="item acea-row row-between-wrapper"
style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;"> style="border-top: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;">

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

@ -41,7 +41,7 @@
</view> </view>
<view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)"> <view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
<view>售后/退款</view> <view>售后/退款</view>
<view class='num'>{{orderData.noComment || 0}}</view> <view class='num'>{{len || 0}}</view>
</view> </view>
</view> </view>
<!--定金预售订单--> <!--定金预售订单-->
@ -264,7 +264,8 @@
<view class='bnt cancelBnt' <view class='bnt cancelBnt'
v-if="item.delivery_type == 1 || item.delivery_type == 2" v-if="item.delivery_type == 1 || item.delivery_type == 2"
@click='goOrderDetails(item.order_id)'>查看物流</view> @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 class='bnt b-color' @tap='confirmOrder(item,index)'
v-if='item.activity_type==98&&item.pay_type==8'>
确认收货 确认收货
</view> </view>
<view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view> <view class='bnt b-color' v-else @tap='confirmOrdera(item,index)'>确认收货</view>
@ -342,6 +343,7 @@
groupOrderList, groupOrderList,
orderTake, orderTake,
applyInvoiceApi, applyInvoiceApi,
refundList
} from '@/api/order.js'; } from '@/api/order.js';
import { import {
getUserInfo getUserInfo
@ -383,6 +385,7 @@
orderStatus: 0, //订单状态 orderStatus: 0, //订单状态
page: 1, page: 1,
limit: 20, limit: 20,
receivingshow: false,
domain: HTTP_REQUEST_URL, domain: HTTP_REQUEST_URL,
payMode: [{ payMode: [{
name: "微信支付", name: "微信支付",
@ -411,13 +414,15 @@
pay_order_id: '', pay_order_id: '',
invoice_order_id: '', invoice_order_id: '',
totalPrice: '0', totalPrice: '0',
order_id: 0,
isAuto: false, //没有授权的不会自动授权 isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权 isShowAuth: false, //是否隐藏授权
isReady: true, isReady: true,
invoice: { invoice: {
invoice: false, invoice: false,
add: false, add: false,
} },
len:0
}; };
}, },
computed: { computed: {
@ -447,8 +452,22 @@
} }
}, },
onReady() {}, onReady() {},
mounted: function() {}, mounted: function() {
this.arrlist()
},
methods: { methods: {
arrlist() {
refundList({
product_type: 98,
type: 0,
page: 1,
limit: 1500
}).then(res => {
this.len = res.data.list.length
})
},
// 后退 // 后退
returns() { returns() {
uni.navigateBack() uni.navigateBack()
@ -785,9 +804,13 @@
}); });
}) })
}, },
close() {
this.receivingshow = false
},
//收货弹窗 //收货弹窗
confirmOrder: function(item) { confirmOrder: function(item) {
console.log(item)
this.order_id = item.order_id
this.receivingshow = true this.receivingshow = true
}, },
@ -873,6 +896,59 @@
</script> </script>
<style scoped lang="scss"> <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 { .head-menu {
height: 50rpx; height: 50rpx;
padding-left: 20rpx; padding-left: 20rpx;