mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-04-07 17:16:33 +08:00
parent 33a80b53cd
commit 7527061444
11 changed files with 1697 additions and 1434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/WaterfallsFlowItem/WaterfallsFlowItem.vue
View File

@ -13,8 +13,9 @@
</view> </view>
<view class="item_tags"> <view class="item_tags">
<!-- 后端返回的标签 --> <!-- 后端返回的标签 -->
<text class="tags_item delivery" :class="{'delivery_yellow': sale_type==2&&i==0}" <text class="tags_item delivery" :class="{'delivery_yellow': e =='批发价'?true:false}"
v-for="(e, i) in item.mer_label_name" :key="i">{{e}}</text> v-for="(e, i) in item.mer_label_name" :key="i">{{e}}</text>
<!-- 商品标签 --> <!-- 商品标签 -->
<!-- <text v-if="item.product_type == 0 && item.merchant.type_name" class="font-bg-red b-color">{{item.merchant.type_name}}</text> <!-- <text v-if="item.product_type == 0 && item.merchant.type_name" class="font-bg-red b-color">{{item.merchant.type_name}}</text>
<text v-else-if="item.product_type == 0 && item.merchant.is_trader" class="font-bg-red b-color">自营</text> --> <text v-else-if="item.product_type == 0 && item.merchant.is_trader" class="font-bg-red b-color">自营</text> -->
@ -99,10 +100,16 @@
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue' import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
import { mapGetters } from "vuex"; import {
import { HTTP_REQUEST_URL } from '@/config/app'; mapGetters
} from "vuex";
import {
HTTP_REQUEST_URL
} from '@/config/app';
export default { export default {
components: { easyLoadimage }, components: {
easyLoadimage
},
computed: mapGetters(['viewColor']), computed: mapGetters(['viewColor']),
props: { props: {
item: { item: {
@ -341,8 +348,7 @@
font-size: 20rpx; font-size: 20rpx;
text-align: center; text-align: center;
border-radius: 5rpx; border-radius: 5rpx;
padding: 0 4rpx; padding: 4rpx 6rpx;
height: 28rpx;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-right: 8rpx; margin-right: 8rpx;
@ -354,15 +360,13 @@
} }
.item_tags .tags_item.delivery { .item_tags .tags_item.delivery {
// color: #FF9000; color: #fff;
// border: 1px solid #FF9000; background-color: var(--view-theme);
color: var(--view-theme);
border: 1px solid var(--view-theme);
} }
.item_tags .tags_item.delivery_yellow { .delivery_yellow {
color: #FF9000; background-color: #FF9000 !important;
border: 1px solid #FF9000; color: #fff !important;
} }
.wf-page1 .text .money .ticket-big { .wf-page1 .text .money .ticket-big {

8
components/popups/index.vue
View File

@ -220,14 +220,14 @@
.keyboard-right-clear { .keyboard-right-clear {
width: 100%; width: 100%;
height: 240rpx; height: 120rpx;
line-height: 226rpx; line-height: 120rpx;
} }
.keyboard-right-pay { .keyboard-right-pay {
width: 100%; width: 100%;
height: 240rpx; height: 360rpx;
line-height: 226rpx; line-height: 360rpx;
text-align: center; text-align: center;
background-color: #40AE36; background-color: #40AE36;
color: #fff !important; color: #fff !important;

5
pages.json
View File

@ -78,7 +78,7 @@
{ {
"path": "pages/payment/get_payment", "path": "pages/payment/get_payment",
"style": { "style": {
"navigationBarTitleText": "提货付款", "navigationBarTitleText": "支付",
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
@ -283,8 +283,7 @@
}, },
{ {
"path": "pages/newActivity/share/share", "path": "pages/newActivity/share/share",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }

201
pages/admin/storeDiy/index.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<view :style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }" <view
:style="{ 'background-image': `linear-gradient(0deg, rgba(0, 0, 0, 0.9) 0%, rgba(0, 0, 0, 0.5) 100%),url(${store.mer_banner})` }"
class="store-home"> class="store-home">
<!-- 搜索 --> <!-- 搜索 -->
<!-- #ifdef MP || APP-PLUS --> <!-- #ifdef MP || APP-PLUS -->
@ -26,7 +27,8 @@
<view :class="{ active: navActive === 0 }" class="item"> <view :class="{ active: navActive === 0 }" class="item">
<view class="cont"> <view class="cont">
{{ select.selected ? '评分' : '默认' }} {{ select.selected ? '评分' : '默认' }}
<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text> <text
:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
</view> </view>
</view> </view>
<view :class="{ active: navActive === 1 }" class="item"> <view :class="{ active: navActive === 1 }" class="item">
@ -35,17 +37,21 @@
<view :class="{ active: navActive === 2 }" class="item"> <view :class="{ active: navActive === 2 }" class="item">
<view class="cont"> <view class="cont">
价格 价格
<image :src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'"></image> <image
:src="sortPrice ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
</image>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="cont"> <view class="cont">
<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text> <text
:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
</view> </view>
</view> </view>
</view> </view>
<view v-show="select.show && navShow" class="select"> <view v-show="select.show && navShow" class="select">
<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"> <view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
class="item">
{{ item.name }} {{ item.name }}
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text> <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view> </view>
@ -82,7 +88,8 @@
<view class="score"> <view class="score">
<view class="star"> <view class="star">
<view <view
:style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}"></view> :style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
</view>
</view> </view>
<view>{{ score.number.toFixed(1) }}</view> <view>{{ score.number.toFixed(1) }}</view>
</view> </view>
@ -110,7 +117,8 @@
<view class="item active"> <view class="item active">
<view class="cont"> <view class="cont">
{{ select.selected ? '评分' : '默认' }} {{ select.selected ? '评分' : '默认' }}
<text :class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text> <text
:class="['arrow-icon', 'iconfont', select.show ? 'icon-xiangshang' : 'icon-xiangxia']"></text>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
@ -121,19 +129,22 @@
<view class="item"> <view class="item">
<view class="cont"> <view class="cont">
价格 价格
<image v-if="navActive === 2 && where.order == 'price_asc'" :src="domain+'/static/diy/up'+keyColor+'.png'"></image> <image v-if="navActive === 2 && where.order == 'price_asc'"
<image v-if="navActive === 2 && where.order == 'price_desc'" :src="domain+'/static/diy/down'+keyColor+'.png'"></image> :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
<image v-if="navActive === 2 && where.order == 'price_desc'"
:src="domain+'/static/diy/down'+keyColor+'.png'"></image>
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="cont"> <view class="cont">
<text :class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text> <text
:class="['layout-icon', 'iconfont', isColumn ? 'icon-pailie' : 'icon-tupianpailie']"></text>
</view> </view>
</view> </view>
</view> </view>
<view v-show="select.show && !navShow" class="select"> <view v-show="select.show && !navShow" class="select">
<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item" <view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
>{{ item.name }} class="item">{{ item.name }}
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text> <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view> </view>
</view> </view>
@ -155,7 +166,8 @@
</view> </view>
</view> </view>
<view v-show="select.show && !navShow" class="select"> <view v-show="select.show && !navShow" class="select">
<view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }" class="item"> <view v-for="item in select.options" :key="item.id" :class="{ active: item.id === select.selected }"
class="item">
{{ item.name }} {{ item.name }}
<text v-if="item.id === select.selected" class="iconfont icon-gou"></text> <text v-if="item.id === select.selected" class="iconfont icon-gou"></text>
</view> </view>
@ -167,13 +179,8 @@
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view v-for="(item, index) in styleConfig" :key="index"> <view v-for="(item, index) in styleConfig" :key="index">
<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'pageFoot'"> <block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'pageFoot'">
<component <component :is="item.name" :index="index" :dataConfig="item" :merId="id"
:is="item.name" @detail="goGoodsDetail"></component>
:index="index"
:dataConfig="item"
:merId="id"
@detail="goGoodsDetail"
></component>
</block> </block>
</block> </block>
</view> </view>
@ -188,9 +195,11 @@
<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination> <combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic> <topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon> <coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item" @detail="goGoodsDetail"></goodList> <goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
@detail="goGoodsDetail"></goodList>
<guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide> <guide v-if="item.name == 'guide'" :merId="id" :dataConfig="item"></guide>
<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item"></liveBroadcast> <liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
</liveBroadcast>
<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus> <menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList> <presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText> <richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
@ -227,14 +236,32 @@
import request from "@/utils/request.js"; import request from "@/utils/request.js";
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue' import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue' import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
import {getStoreDetail, getStoreGoods, getStoreCategory, storeServiceList, hasServiceApi} from '@/api/store.js'; import {
import { getDiy } from '@/api/api.js'; getStoreDetail,
import { getUserInfo } from '@/api/user.js'; getStoreGoods,
import { configMap } from "@/utils"; getStoreCategory,
import { mapGetters } from "vuex"; storeServiceList,
import { goShopDetail } from '@/libs/order.js'; hasServiceApi
} from '@/api/store.js';
import {
getDiy
} from '@/api/api.js';
import {
getUserInfo
} from '@/api/user.js';
import {
configMap
} from "@/utils";
import {
mapGetters
} from "vuex";
import {
goShopDetail
} from '@/libs/order.js';
import emptyPage from '@/components/emptyPage.vue' import emptyPage from '@/components/emptyPage.vue'
import { HTTP_REQUEST_URL } from '@/config/app'; import {
HTTP_REQUEST_URL
} from '@/config/app';
import mConfig from '../../store/component/index.js'; import mConfig from '../../store/component/index.js';
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
import activeParty from '../../index/component/activeParty'; import activeParty from '../../index/component/activeParty';
@ -389,7 +416,8 @@
number: 0 number: 0
}; };
if ('postage_score' in store) { if ('postage_score' in store) {
score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(store.service_score)) / score.number = (parseFloat(store.postage_score) + parseFloat(store.product_score) + parseFloat(
store.service_score)) /
3; 3;
score.star = score.number / 5 * 100; score.star = score.number / 5 * 100;
} }
@ -435,7 +463,11 @@
// 获取diy模板数据 // 获取diy模板数据
diyData() { diyData() {
let that = this; let that = this;
getDiy({id: that.id, did: that.did, version: '221'}).then(res => { getDiy({
id: that.id,
did: that.did,
version: '221'
}).then(res => {
let data = res.data; let data = res.data;
that.styleConfig = that.objToArr(data.value); that.styleConfig = that.objToArr(data.value);
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
@ -461,7 +493,8 @@
if (this.id == 0) { if (this.id == 0) {
this.tabs = this.tabs1 this.tabs = this.tabs1
} else { } else {
if((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way.length == 2){ if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data
.delivery_way.length == 2) {
this.tabs = this.tabs1 this.tabs = this.tabs1
this.service_open = true this.service_open = true
} else { } else {
@ -528,11 +561,13 @@
min-height: 500rpx; min-height: 500rpx;
pointer-events: none; pointer-events: none;
} }
/deep/.care { /deep/.care {
background-image: none !important; background-image: none !important;
border: 1px solid #fff; border: 1px solid #fff;
background-color: transparent; background-color: transparent;
} }
.store-home { .store-home {
position: fixed; position: fixed;
top: 0; top: 0;
@ -547,6 +582,7 @@
background: left top/750rpx 390rpx no-repeat fixed; background: left top/750rpx 390rpx no-repeat fixed;
overflow: hidden; overflow: hidden;
} }
.header { .header {
position: relative; position: relative;
z-index: 6; z-index: 6;
@ -555,6 +591,7 @@
padding-right: 34rpx; padding-right: 34rpx;
height: 43px; height: 43px;
padding-left: 33rpx; padding-left: 33rpx;
.head-menu { .head-menu {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@ -566,10 +603,12 @@
width: 70px; width: 70px;
background: rgba(0, 0, 0, 0.25); background: rgba(0, 0, 0, 0.25);
border-radius: 13px; border-radius: 13px;
.icon-xiangzuo { .icon-xiangzuo {
font-size: 32rpx; font-size: 32rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.iconfont { .iconfont {
-webkit-box-flex: 1; -webkit-box-flex: 1;
-webkit-flex: 1; -webkit-flex: 1;
@ -577,11 +616,13 @@
text-align: center; text-align: center;
color: #fff; color: #fff;
box-sizing: border-box; box-sizing: border-box;
&.icon-xiangzuo { &.icon-xiangzuo {
border-right: 1px solid rgba(255, 255, 255, .3); border-right: 1px solid rgba(255, 255, 255, .3);
} }
} }
} }
.search { .search {
flex: 1; flex: 1;
display: flex; display: flex;
@ -596,6 +637,7 @@
color: #999999; color: #999999;
/* #ifdef MP */ /* #ifdef MP */
margin-right: 200rpx; margin-right: 200rpx;
/* #endif */ /* #endif */
.iconfont { .iconfont {
margin-right: 13rpx; margin-right: 13rpx;
@ -604,14 +646,17 @@
} }
} }
} }
.main_count { .main_count {
background-color: #ffffff; background-color: #ffffff;
padding: 30rpx 20rpx; padding: 30rpx 20rpx;
.list { .list {
width: 710rpx; width: 710rpx;
height: 280rpx; height: 280rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
position: relative; position: relative;
.picture { .picture {
width: 710rpx; width: 710rpx;
height: 280rpx; height: 280rpx;
@ -619,12 +664,14 @@
} }
} }
} }
.main { .main {
flex: 1; flex: 1;
min-height: 0rpx; min-height: 0rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 0; padding: 0;
} }
.store { .store {
position: relative; position: relative;
z-index: 6; z-index: 6;
@ -634,33 +681,40 @@
padding-left: 20rpx; padding-left: 20rpx;
padding-top: 20rpx; padding-top: 20rpx;
padding-bottom: 22rpx; padding-bottom: 22rpx;
image { image {
width: 74rpx; width: 74rpx;
height: 74rpx; height: 74rpx;
border-radius: 6rpx; border-radius: 6rpx;
} }
.store-margin { .store-margin {
width: 26rpx; width: 26rpx;
height: 26rpx; height: 26rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
.kefu { .kefu {
color: #ffffff; color: #ffffff;
margin-right: 26rpx; margin-right: 26rpx;
cursor: pointer; cursor: pointer;
.icon-kefu3 { .icon-kefu3 {
font-size: 34rpx; font-size: 34rpx;
} }
} }
.text { .text {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
margin-right: 20rpx; margin-right: 20rpx;
margin-left: 20rpx; margin-left: 20rpx;
.text-view { .text-view {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
max-width: 100%; max-width: 100%;
.name { .name {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
@ -672,12 +726,14 @@
line-height: 1; line-height: 1;
color: #FFFFFF; color: #FFFFFF;
} }
.iconfont { .iconfont {
margin-left: 10rpx; margin-left: 10rpx;
font-size: 17rpx; font-size: 17rpx;
color: #FFFFFF; color: #FFFFFF;
} }
} }
.score { .score {
display: flex; display: flex;
align-items: center; align-items: center;
@ -686,6 +742,7 @@
font-size: 24rpx; font-size: 24rpx;
line-height: 1; line-height: 1;
color: #FFFFFF; color: #FFFFFF;
.star { .star {
position: relative; position: relative;
width: 111rpx; width: 111rpx;
@ -693,6 +750,7 @@
margin-right: 10rpx; margin-right: 10rpx;
background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat; background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat;
overflow: hidden; overflow: hidden;
view { view {
position: absolute; position: absolute;
top: 0; top: 0;
@ -700,6 +758,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat; background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
&.star_purple { &.star_purple {
background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat; background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
} }
@ -707,6 +766,7 @@
} }
} }
} }
button { button {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -718,40 +778,49 @@
font-weight: 500; font-weight: 500;
font-size: 22rpx; font-size: 22rpx;
color: #FFFFFF; color: #FFFFFF;
.iconfont { .iconfont {
margin-right: 6rpx; margin-right: 6rpx;
font-size: 22rpx; font-size: 22rpx;
} }
&.gary { &.gary {
background-color: #999; background-color: #999;
} }
} }
} }
.font-bg-red { .font-bg-red {
background-color: var(--view-theme); background-color: var(--view-theme);
border: 1px solid var(--view-theme); border: 1px solid var(--view-theme);
} }
.nav.fixed { .nav.fixed {
position: fixed; position: fixed;
left: 0; left: 0;
width: 100%; width: 100%;
.nav-cont { .nav-cont {
position: absolute; position: absolute;
width: 100%; width: 100%;
} }
} }
.nav { .nav {
position: relative; position: relative;
.nav-cont { .nav-cont {
display: flex; display: flex;
align-items: center; align-items: center;
height: 84rpx; height: 84rpx;
.item { .item {
flex: 1; flex: 1;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
min-width: 0; min-width: 0;
.cont { .cont {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -762,16 +831,20 @@
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #FFFFFF;
.arrow-icon { .arrow-icon {
margin-left: 10rpx; margin-left: 10rpx;
font-size: 18rpx; font-size: 18rpx;
} }
.layout-icon { .layout-icon {
font-size: 32rpx; font-size: 32rpx;
} }
.icon-pailie { .icon-pailie {
font-size: 32rpx; font-size: 32rpx;
} }
image { image {
width: 15rpx; width: 15rpx;
height: 21rpx; height: 21rpx;
@ -779,6 +852,7 @@
} }
} }
} }
.active { .active {
.cont { .cont {
background-color: #FFFFFF; background-color: #FFFFFF;
@ -787,6 +861,7 @@
} }
} }
} }
.select { .select {
position: absolute; position: absolute;
top: 100%; top: 100%;
@ -800,13 +875,16 @@
border-bottom-left-radius: 24rpx; border-bottom-left-radius: 24rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06); box-shadow: 0px 2px 10px 0px rgba(0, 0, 0, 0.06);
.item { .item {
margin-top: 28rpx; margin-top: 28rpx;
font-size: 24rpx; font-size: 24rpx;
color: #454545; color: #454545;
} }
.active { .active {
color: var(--view-theme); color: var(--view-theme);
.iconfont { .iconfont {
color: var(--view-theme); color: var(--view-theme);
float: right; float: right;
@ -815,6 +893,7 @@
} }
} }
} }
.goods { .goods {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -824,12 +903,14 @@
padding-left: 20rpx; padding-left: 20rpx;
background-color: #F5F5F5; background-color: #F5F5F5;
width: 750rpx; width: 750rpx;
.item { .item {
width: 345rpx; width: 345rpx;
border-radius: 16rpx; border-radius: 16rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: hidden; overflow: hidden;
.sell_out { .sell_out {
display: flex; display: flex;
width: 110rpx; width: 110rpx;
@ -844,6 +925,7 @@
top: 50%; top: 50%;
left: 50%; left: 50%;
margin: -55rpx 0 0 -55rpx; margin: -55rpx 0 0 -55rpx;
&::before { &::before {
content: ""; content: "";
display: block; display: block;
@ -856,17 +938,24 @@
left: 5rpx; left: 5rpx;
} }
} }
.image,.easy-loadimage,image,uni-image {
.image,
.easy-loadimage,
image,
uni-image {
width: 345rpx; width: 345rpx;
height: 345rpx; height: 345rpx;
image { image {
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
} }
.text { .text {
padding: 20rpx 20rpx 25rpx; padding: 20rpx 20rpx 25rpx;
.name { .name {
font-weight: 500; font-weight: 500;
font-size: 30rpx; font-size: 30rpx;
@ -874,25 +963,30 @@
color: #222222; color: #222222;
display: flex; display: flex;
align-items: center; align-items: center;
.name_text { .name_text {
display: inline-block; display: inline-block;
max-width: 400rpx; max-width: 400rpx;
} }
} }
.money-wrap { .money-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 43rpx; margin-top: 43rpx;
.money { .money {
font-weight: bold; font-weight: bold;
font-size: 26rpx; font-size: 26rpx;
color: var(--view-priceColor); color: var(--view-priceColor);
text { text {
font-size: 34rpx; font-size: 34rpx;
line-height: 1; line-height: 1;
} }
} }
} }
.score { .score {
margin-top: 20rpx; margin-top: 20rpx;
font-weight: 500; font-weight: 500;
@ -901,9 +995,11 @@
color: #737373; color: #737373;
} }
} }
.item_tags { .item_tags {
margin-top: 8rpx; margin-top: 8rpx;
} }
.item_tags .tags_item { .item_tags .tags_item {
display: inline-block; display: inline-block;
font-size: 20rpx; font-size: 20rpx;
@ -913,14 +1009,17 @@
line-height: 28rpx; line-height: 28rpx;
margin-right: 8rpx; margin-right: 8rpx;
} }
.item_tags .tags_item.ticket { .item_tags .tags_item.ticket {
border: 1px solid var(--view-theme); border: 1px solid var(--view-theme);
color: var(--view-theme); color: var(--view-theme);
} }
.item_tags .tags_item.delivery { .item_tags .tags_item.delivery {
color: #FF9000; color: #FF9000;
border: 1px solid #FF9000; border: 1px solid #FF9000;
} }
.foot { .foot {
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -930,6 +1029,7 @@
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #FFFFFF;
.iconfont { .iconfont {
margin-right: 10rpx; margin-right: 10rpx;
font-size: 22rpx; font-size: 22rpx;
@ -942,6 +1042,7 @@
.column { .column {
padding: 0; padding: 0;
background-color: #FFFFFF; background-color: #FFFFFF;
.item { .item {
position: relative; position: relative;
display: flex; display: flex;
@ -949,6 +1050,7 @@
padding: 30rpx 20rpx; padding: 30rpx 20rpx;
border-radius: 0; border-radius: 0;
margin-bottom: 0; margin-bottom: 0;
&::before { &::before {
content: " "; content: " ";
position: absolute; position: absolute;
@ -957,7 +1059,11 @@
left: 250rpx; left: 250rpx;
border-top: 1px solid #F5F5F5; border-top: 1px solid #F5F5F5;
} }
/deep/.image,/deep/.easy-loadimage,/deep/image,/deep/uni-image {
/deep/.image,
/deep/.easy-loadimage,
/deep/image,
/deep/uni-image {
width: 260rpx; width: 260rpx;
height: 260rpx; height: 260rpx;
border-radius: 16rpx; border-radius: 16rpx;
@ -965,6 +1071,7 @@
position: relative; position: relative;
} }
.border-picture { .border-picture {
position: absolute; position: absolute;
top: 0; top: 0;
@ -973,6 +1080,7 @@
height: 100%; height: 100%;
background: center/cover no-repeat; background: center/cover no-repeat;
} }
.text { .text {
position: relative; position: relative;
width: 450rpx; width: 450rpx;
@ -980,18 +1088,22 @@
padding-top: 0; padding-top: 0;
padding-right: 0; padding-right: 0;
padding-bottom: 0; padding-bottom: 0;
.name { .name {
color: #282828; color: #282828;
width: 100%; width: 100%;
display: flex; display: flex;
} }
.item_bot { .item_bot {
width: 100%; width: 100%;
} }
.money-wrap { .money-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 52rpx; margin-top: 52rpx;
.ticket { .ticket {
height: 28rpx; height: 28rpx;
padding-right: 12rpx; padding-right: 12rpx;
@ -1005,6 +1117,7 @@
} }
} }
} }
.foot { .foot {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
@ -1018,14 +1131,17 @@
} }
} }
} }
.category { .category {
padding-top: 34rpx; padding-top: 34rpx;
padding-right: 20rpx; padding-right: 20rpx;
padding-left: 20rpx; padding-left: 20rpx;
.section { .section {
border-radius: 10rpx; border-radius: 10rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
.head { .head {
position: relative; position: relative;
display: flex; display: flex;
@ -1035,6 +1151,7 @@
padding-left: 36rpx; padding-left: 36rpx;
font-weight: bold; font-weight: bold;
color: #282828; color: #282828;
&::before { &::before {
content: " "; content: " ";
position: absolute; position: absolute;
@ -1045,6 +1162,7 @@
background-color: var(--view-theme); background-color: var(--view-theme);
transform: translateY(-50%); transform: translateY(-50%);
} }
.title { .title {
flex: 1; flex: 1;
min-width: 0; min-width: 0;
@ -1053,17 +1171,20 @@
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 30rpx; font-size: 30rpx;
} }
.iconfont { .iconfont {
font-size: 22rpx; font-size: 22rpx;
line-height: 1; line-height: 1;
} }
} }
.body { .body {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 9rpx 36rpx 14rpx; padding: 9rpx 36rpx 14rpx;
.item { .item {
width: 314rpx; width: 314rpx;
height: 84rpx; height: 84rpx;
@ -1083,6 +1204,7 @@
} }
} }
} }
.empty-box { .empty-box {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -1090,15 +1212,18 @@
align-items: center; align-items: center;
margin-top: 0; margin-top: 0;
padding-top: 200rpx; padding-top: 200rpx;
image { image {
width: 414rpx; width: 414rpx;
height: 240rpx; height: 240rpx;
} }
.txt { .txt {
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
} }
} }
.footer { .footer {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -1111,6 +1236,7 @@
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
background-color: #FFFFFF; background-color: #FFFFFF;
opacity: 0.96; opacity: 0.96;
.item { .item {
flex: 1; flex: 1;
display: flex; display: flex;
@ -1120,30 +1246,37 @@
font-weight: 500; font-weight: 500;
font-size: 20rpx; font-size: 20rpx;
color: #282828; color: #282828;
.iconfont { .iconfont {
font-size: 43rpx; font-size: 43rpx;
} }
.icon-zhuanti { .icon-zhuanti {
font-size: 38rpx; font-size: 38rpx;
} }
} }
.active { .active {
color: var(--view-theme); color: var(--view-theme);
} }
} }
.p-b-75 { .p-b-75 {
padding-bottom: 150rpx; padding-bottom: 150rpx;
} }
.vip-money { .vip-money {
color: #282828; color: #282828;
font-size: 22rpx; font-size: 22rpx;
margin-left: 6rpx; margin-left: 6rpx;
font-weight: bold; font-weight: bold;
} }
.vipImg { .vipImg {
width: 65rpx; width: 65rpx;
height: 28rpx; height: 28rpx;
margin-left: 4rpx; margin-left: 4rpx;
image { image {
width: 100% !important; width: 100% !important;
height: 100% !important; height: 100% !important;

25
pages/cloud_warehouse/home/home.vue
View File

@ -5,6 +5,7 @@
.wholeSale { .wholeSale {
background-color: #f8fafb !important; background-color: #f8fafb !important;
.wholeSale-header { .wholeSale-header {
margin-bottom: 20rpx; margin-bottom: 20rpx;
// background-color: #40AE36; // background-color: #40AE36;
@ -49,6 +50,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 40rpx; margin-bottom: 40rpx;
.icon { .icon {
margin-right: 20rpx; margin-right: 20rpx;
} }
@ -206,7 +208,8 @@
<!-- 适配不同机 --> <!-- 适配不同机 -->
<view style="height: var(--status-bar-height);background-color: #40af37;"></view> <view style="height: var(--status-bar-height);background-color: #40af37;"></view>
<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;"> <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view> <view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
</view> </view>
</view> </view>
@ -215,12 +218,12 @@
<view class="wholeSale-nav"> <view class="wholeSale-nav">
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> --> <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
<!-- 搜索 --> <!-- 搜索 -->
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none" <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
class="search_content flex_a_c_j_sb"> hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c search_content_wrap"> <view class="flex_a_c search_content_wrap">
<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view> <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
<input type="text" placeholder="搜索商品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;" <input type="text" placeholder="搜索商品名称" :value="where.keyword"
disabled style="pointer-events: none;"> placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
</view> </view>
<!-- <button class="search_btn">搜索</button> --> <!-- <button class="search_btn">搜索</button> -->
</view> </view>
@ -231,8 +234,10 @@
<scroll-view scroll-x="true"> <scroll-view scroll-x="true">
<view class="category-wrap"> <view class="category-wrap">
<block v-for="(item,index) in store_category" :key="index"> <block v-for="(item,index) in store_category" :key="index">
<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)"> <view class="category-item" :class="{'category-item-active': index==cate_change}"
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle"> @click="changeCate(index)">
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
shape="circle">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#999" size="15" /> <u-loading-icon color="#999" size="15" />
</template> </template>
@ -249,7 +254,8 @@
<scroll-view scroll-x="true"> <scroll-view scroll-x="true">
<view class="cate-wrap"> <view class="cate-wrap">
<block v-for="(item,index) in store_category_children" :key="index"> <block v-for="(item,index) in store_category_children" :key="index">
<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}" @click="changeChildrenCate(index)"> <view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
@click="changeChildrenCate(index)">
<text>{{item.cate_name}}</text> <text>{{item.cate_name}}</text>
</view> </view>
</block> </block>
@ -355,7 +361,8 @@
changeChildrenCate(e) { changeChildrenCate(e) {
this.cate_change_children = e; this.cate_change_children = e;
this.where.mer_cate_id = this.store_category_children[e].store_category_id; this.where.mer_cate_id = this.store_category_children[e].store_category_id;
if(e==0) this.where.mer_cate_id = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id if (e == 0) this.where.mer_cate_id = this.store_category[this.cate_change]
.store_category_id; // 如若选中全部, 则取父级id
this.getProductslist(true); this.getProductslist(true);
}, },
getStoreCategory() { getStoreCategory() {

90
pages/columnGoods/goods_search/index.vue
View File

@ -4,8 +4,8 @@
<view class='search acea-row row-between-wrapper'> <view class='search acea-row row-between-wrapper'>
<view class='input acea-row row-between-wrapper'> <view class='input acea-row row-between-wrapper'>
<text class='iconfont icon-sousuo2'></text> <text class='iconfont icon-sousuo2'></text>
<input type='text' :value='searchValue' :focus="focus" :placeholder="isShop?'点击搜索店铺名称':'点击搜索商品名称'" placeholder-class='placeholder' <input type='text' :value='searchValue' :focus="focus" :placeholder="isShop?'点击搜索店铺名称':'点击搜索商品名称'"
@input="setValue"></input> placeholder-class='placeholder' @input="setValue"></input>
</view> </view>
<view class='bnt' @tap='searchBut'>搜索</view> <view class='bnt' @tap='searchBut'>搜索</view>
</view> </view>
@ -25,7 +25,9 @@
</view> </view>
<view v-if="historyList.length == 0" style="text-align: center; color: #999;">暂无搜索历史~</view> <view v-if="historyList.length == 0" style="text-align: center; color: #999;">暂无搜索历史~</view>
<block v-if="isShop==false"> <block v-if="isShop==false">
<view class='title'>热门搜索</view>
<!-- <view class='title'>热门搜索</view>
<view class='list acea-row' :style="{'height': hotSearchBox?'auto':'150rpx'}"> <view class='list acea-row' :style="{'height': hotSearchBox?'auto':'150rpx'}">
<block v-for="(item,index) in hotSearchList" :key="index"> <block v-for="(item,index) in hotSearchList" :key="index">
<view class='item line1' @tap='setHotSearchValue(item,1)'>{{item.keyword}}</view> <view class='item line1' @tap='setHotSearchValue(item,1)'>{{item.keyword}}</view>
@ -38,9 +40,9 @@
<view class="more-btn" v-if="hotSearchList.length>8 && hotSearchBox" @click="hotSearchBox = false"> <view class="more-btn" v-if="hotSearchList.length>8 && hotSearchBox" @click="hotSearchBox = false">
收起<text class="iconfont icon-xiangshang"></text> 收起<text class="iconfont icon-xiangshang"></text>
</view> </view>
</view> </view> -->
<!--今日热搜模块--> <!--今日热搜模块-->
<view class="search-hot"> <!-- <view class="search-hot">
<scroll-view v-if="isShow" scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation show-scrollbar="true"> <scroll-view v-if="isShow" scroll-x="true" style="white-space: nowrap; display: flex;" scroll-with-animation show-scrollbar="true">
<view v-if="daySearchList.length>0" class="scroll-count"> <view v-if="daySearchList.length>0" class="scroll-count">
<view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}"> <view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}">
@ -70,7 +72,7 @@
</view> </view>
</view> </view>
</view> </view>
<!--热销排行--> 热销排行
<view v-for="(item,index) in hotRankList" class="scroll-count"> <view v-for="(item,index) in hotRankList" class="scroll-count">
<view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}"> <view class="scroll-item" :style="{'background-image':`url(${domain}/static/images/search-title-bg.png)`}">
<view class="search-title"> <view class="search-title">
@ -110,7 +112,7 @@
<text>开启热搜榜</text> <text>开启热搜榜</text>
</view> </view>
</view> </view>
</view> </view> -->
</block> </block>
</view> </view>
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
@ -129,17 +131,34 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import { getSearchKeyword,copyPasswordSearch,getTodayHotSearch,getHotRanking } from '@/api/store.js'; import {
getSearchKeyword,
copyPasswordSearch,
getTodayHotSearch,
getHotRanking
} from '@/api/store.js';
import shareScence from '@/libs/spread'; import shareScence from '@/libs/spread';
import { silenceBindingSpread } from '@/utils'; import {
import { goShopDetail } from '@/libs/order.js'; silenceBindingSpread
import { initiateAssistApi } from '@/api/activity.js'; } from '@/utils';
import { mapGetters } from 'vuex'; import {
import { HTTP_REQUEST_URL } from '@/config/app'; goShopDetail
} from '@/libs/order.js';
import {
initiateAssistApi
} from '@/api/activity.js';
import {
mapGetters
} from 'vuex';
import {
HTTP_REQUEST_URL
} from '@/config/app';
// #ifndef H5 // #ifndef H5
import passwordPopup from '@/components/passwordPopup'; import passwordPopup from '@/components/passwordPopup';
// #endif // #endif
import { toLogin } from '@/libs/login.js'; import {
toLogin
} from '@/libs/login.js';
export default { export default {
computed: mapGetters(['isLogin', 'uid']), computed: mapGetters(['isLogin', 'uid']),
components: { components: {
@ -269,7 +288,9 @@
title: '加载中', title: '加载中',
mask: true mask: true
}); });
copyPasswordSearch({key: this.searchValue}).then(res => { copyPasswordSearch({
key: this.searchValue
}).then(res => {
uni.hideLoading(); uni.hideLoading();
let item = res.data let item = res.data
shareScence(res.data.user.uid, this.isLogin); shareScence(res.data.user.uid, this.isLogin);
@ -283,7 +304,8 @@
let id = res.data.product_assist_set_id; let id = res.data.product_assist_set_id;
uni.hideLoading(); uni.hideLoading();
uni.navigateTo({ uni.navigateTo({
url: '/pages/activity/assist_detail/index?id=' + id url: '/pages/activity/assist_detail/index?id=' +
id
}); });
}) })
@ -335,9 +357,11 @@
.searchGood .search { .searchGood .search {
padding-left: 30rpx; padding-left: 30rpx;
} }
.searchGood .search { .searchGood .search {
margin-top: 20rpx; margin-top: 20rpx;
} }
.searchGood .search .input { .searchGood .search .input {
width: 598rpx; width: 598rpx;
background-color: #f7f7f7; background-color: #f7f7f7;
@ -346,17 +370,21 @@
box-sizing: border-box; box-sizing: border-box;
height: 66rpx; height: 66rpx;
} }
.searchGood .search .input input { .searchGood .search .input input {
width: 472rpx; width: 472rpx;
font-size: 28rpx; font-size: 28rpx;
} }
.searchGood .search .input .placeholder { .searchGood .search .input .placeholder {
color: #bbb; color: #bbb;
} }
.searchGood .search .input .iconfont { .searchGood .search .input .iconfont {
color: #000; color: #000;
font-size: 35rpx; font-size: 35rpx;
} }
.searchGood .search .bnt { .searchGood .search .bnt {
width: 120rpx; width: 120rpx;
text-align: center; text-align: center;
@ -365,11 +393,13 @@
font-size: 30rpx; font-size: 30rpx;
color: #282828; color: #282828;
} }
.searchGood .title { .searchGood .title {
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
margin: 50rpx 30rpx 25rpx 30rpx; margin: 50rpx 30rpx 25rpx 30rpx;
.icon-shanchu { .icon-shanchu {
position: absolute; position: absolute;
right: 0; right: 0;
@ -378,10 +408,12 @@
color: #999; color: #999;
} }
} }
.searchGood .list { .searchGood .list {
padding: 0 10rpx; padding: 0 10rpx;
overflow: hidden; overflow: hidden;
} }
.searchGood .list .item { .searchGood .list .item {
font-size: 26rpx; font-size: 26rpx;
color: #666; color: #666;
@ -393,10 +425,12 @@
margin: 0 0 20rpx 20rpx; margin: 0 0 20rpx 20rpx;
max-width: 150rpx; max-width: 150rpx;
} }
.searchGood .line { .searchGood .line {
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
margin: 20rpx 30rpx 0 30rpx; margin: 20rpx 30rpx 0 30rpx;
} }
.more-btn { .more-btn {
display: flex; display: flex;
align-items: center; align-items: center;
@ -405,22 +439,27 @@
height: 60rpx; height: 60rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
.iconfont { .iconfont {
font-size: 22rpx; font-size: 22rpx;
margin-left: 10rpx; margin-left: 10rpx;
} }
} }
.search-hot { .search-hot {
padding: 0 30rpx 30rpx; padding: 0 30rpx 30rpx;
padding-bottom: calc(30rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ padding-bottom: calc(30rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
padding-bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ padding-bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
scroll-view { scroll-view {
width: 100%; width: 100%;
} }
/deep/.uni-scroll-view-content { /deep/.uni-scroll-view-content {
display: flex; display: flex;
} }
} }
.scroll-item { .scroll-item {
border: 1px solid #FFECEC; border: 1px solid #FFECEC;
border-radius: 16rpx; border-radius: 16rpx;
@ -428,14 +467,17 @@
background-size: 100% auto; background-size: 100% auto;
height: 980rpx; height: 980rpx;
} }
.scroll-count { .scroll-count {
display: inline-block; display: inline-block;
width: 450rpx; width: 450rpx;
margin-right: 30rpx; margin-right: 30rpx;
vertical-align: top; vertical-align: top;
&:last-child { &:last-child {
margin-right: 0; margin-right: 0;
} }
.search-title { .search-title {
padding: 20rpx 20rpx 32rpx; padding: 20rpx 20rpx 32rpx;
color: #E93323; color: #E93323;
@ -443,58 +485,70 @@
font-weight: bold; font-weight: bold;
display: flex; display: flex;
align-items: center; align-items: center;
.title-icon { .title-icon {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
} }
.search-list { .search-list {
padding: 0 20rpx 40rpx; padding: 0 20rpx 40rpx;
position: relative; position: relative;
top: -15rpx; top: -15rpx;
} }
.search-item { .search-item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
&:nth-child(n+3) { &:nth-child(n+3) {
margin-bottom: 0; margin-bottom: 0;
} }
.list-more { .list-more {
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 40rpx; margin-top: 40rpx;
} }
.picture { .picture {
width: 106rpx; width: 106rpx;
height: 106rpx; height: 106rpx;
border-radius: 10rpx; border-radius: 10rpx;
position: relative; position: relative;
.image { .image {
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 10rpx; border-radius: 10rpx;
} }
} }
.list-info { .list-info {
max-width: 260rpx; max-width: 260rpx;
margin-left: 20rpx; margin-left: 20rpx;
} }
.title { .title {
margin: 0; margin: 0;
color: #282828; color: #282828;
font-size: 26rpx; font-size: 26rpx;
&.titleml { &.titleml {
margin-left: 15rpx; margin-left: 15rpx;
max-width: 360rpx; max-width: 360rpx;
} }
} }
.info { .info {
font-size: 22rpx; font-size: 22rpx;
color: #999999; color: #999999;
} }
} }
.list-num { .list-num {
width: 28rpx; width: 28rpx;
height: 31rpx; height: 31rpx;
@ -504,6 +558,7 @@
font-size: 20rpx; font-size: 20rpx;
color: #ffffff; color: #ffffff;
background-size: 100% 100%; background-size: 100% 100%;
&.num-pic { &.num-pic {
position: absolute; position: absolute;
top: 0; top: 0;
@ -511,8 +566,10 @@
} }
} }
} }
.search-hot-switch { .search-hot-switch {
margin-top: 20rpx; margin-top: 20rpx;
.switch { .switch {
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;
border-radius: 22rpx; border-radius: 22rpx;
@ -523,6 +580,7 @@
height: 43rpx; height: 43rpx;
color: #666666; color: #666666;
font-size: 20rpx; font-size: 20rpx;
.iconfont { .iconfont {
font-size: 24rpx; font-size: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;

9
pages/payment/get_payment.vue
View File

@ -2,7 +2,7 @@
<view class="container"> <view class="container">
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<view v-if="!isWeixin" class="v-navbar"> <view v-if="!isWeixin" class="v-navbar">
<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent" <u-navbar title="支付" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
leftIconColor="#333" :titleStyle="{color:'#333',fontWeight:'bold',fontSize:'32rpx'}"> leftIconColor="#333" :titleStyle="{color:'#333',fontWeight:'bold',fontSize:'32rpx'}">
</u-navbar> </u-navbar>
</view> </view>
@ -49,11 +49,12 @@
</scroll-view> --> </scroll-view> -->
</view> </view>
</view> </view>
<!-- #ifdef H5 -->
<view class="v-btn-wrap" @click="submitOrder"> <!-- <view class="v-btn-wrap" @click="submitOrder">
<u-button class="v-btn" :loading="loading" <u-button class="v-btn" :loading="loading"
:text="Number(cartForm.total_amount||0).toFixed(2)+'元 确认支付'"></u-button> :text="Number(cartForm.total_amount||0).toFixed(2)+'元 确认支付'"></u-button>
</view> </view> -->
<!-- #endif -->
<!-- 登陆 --> <!-- 登陆 -->
<authorize :isAuto="isAuto" :is-pay="true" :isShowAuth="isShowAuth" @authColse="authColse" <authorize :isAuto="isAuto" :is-pay="true" :isShowAuth="isShowAuth" @authColse="authColse"

2
pages/payment/settlement.vue
View File

@ -102,7 +102,7 @@
<text @click="openDiscount">优惠明细</text> <text @click="openDiscount">优惠明细</text>
</view> </view>
</view> </view>
<view class='settlement' style='z-index:100' @tap="SubOrder">{{'提交订单'}}</view> <view class='settlement' style='z-index:100' @tap="SubOrder">{{'立即支付'}}</view>
</view> </view>
</view> </view>
<block v-if="coupon.status"> <block v-if="coupon.status">

29
pages/plantGrass/plant_search/index.vue
View File

@ -4,8 +4,9 @@
<view class='search acea-row row-between-wrapper'> <view class='search acea-row row-between-wrapper'>
<view class='input acea-row row-between-wrapper'> <view class='input acea-row row-between-wrapper'>
<text class='iconfont icon-sousuo2'></text> <text class='iconfont icon-sousuo2'></text>
<input type='text' :value='searchValue' :focus="focus" placeholder='请输入关键字' placeholder-class='placeholder' <input type='text' :value='searchValue' :focus="focus" placeholder='请输入关键字'
@input="setValue" confirm-type="search" @confirm="searchBut()"></input> placeholder-class='placeholder' @input="setValue" confirm-type="search"
@confirm="searchBut()"></input>
</view> </view>
<view class='bnt' @tap='searchCancle'>取消</view> <view class='bnt' @tap='searchCancle'>取消</view>
</view> </view>
@ -24,20 +25,20 @@
</view> </view>
</view> </view>
<view v-if="historyList.length == 0" style="text-align: center; color: #999;">暂无搜索历史~</view> <view v-if="historyList.length == 0" style="text-align: center; color: #999;">暂无搜索历史~</view>
<view class='title'>热门搜索</view> <!-- <view class='title'>热门搜索</view>
<view class='list acea-row' :style="{'height': hotSearchBox?'auto':'150rpx'}"> <view class='list acea-row' :style="{'height': hotSearchBox?'auto':'150rpx'}">
<block v-for="(item,index) in hotSearchList" :key="index"> <block v-for="(item,index) in hotSearchList" :key="index">
<view class='item line1' @tap='setHotSearchValue(item,1)'>{{item.keyword}}</view> <view class='item line1' @tap='setHotSearchValue(item,1)'>{{item.keyword}}</view>
</block> </block>
</view> </view> -->
<view> <!-- <view>
<view class="more-btn" v-if="hotSearchList.length>8 && !hotSearchBox" @click="hotSearchBox = true"> <view class="more-btn" v-if="hotSearchList.length>8 && !hotSearchBox" @click="hotSearchBox = true">
展开全部<text class="iconfont icon-xiangxia"></text> 展开全部<text class="iconfont icon-xiangxia"></text>
</view> </view>
<view class="more-btn" v-if="hotSearchList.length>8 && hotSearchBox" @click="hotSearchBox = false"> <view class="more-btn" v-if="hotSearchList.length>8 && hotSearchBox" @click="hotSearchBox = false">
收起<text class="iconfont icon-xiangshang"></text> 收起<text class="iconfont icon-xiangshang"></text>
</view> </view>
</view> </view> -->
</view> </view>
</view> </view>
</template> </template>
@ -52,7 +53,9 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com> // | Author: CRMEB Team <admin@crmeb.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
import { hotSearchLst } from '@/api/community.js'; import {
hotSearchLst
} from '@/api/community.js';
export default { export default {
data() { data() {
return { return {
@ -166,6 +169,7 @@
padding-left: 30rpx; padding-left: 30rpx;
margin-top: 20rpx; margin-top: 20rpx;
} }
.searchGood .search .input { .searchGood .search .input {
width: 598rpx; width: 598rpx;
background-color: #f7f7f7; background-color: #f7f7f7;
@ -174,17 +178,21 @@
box-sizing: border-box; box-sizing: border-box;
height: 66rpx; height: 66rpx;
} }
.searchGood .search .input input { .searchGood .search .input input {
width: 472rpx; width: 472rpx;
font-size: 28rpx; font-size: 28rpx;
} }
.searchGood .search .input .placeholder { .searchGood .search .input .placeholder {
color: #bbb; color: #bbb;
} }
.searchGood .search .input .iconfont { .searchGood .search .input .iconfont {
color: #000; color: #000;
font-size: 35rpx; font-size: 35rpx;
} }
.searchGood .search .bnt { .searchGood .search .bnt {
width: 120rpx; width: 120rpx;
text-align: center; text-align: center;
@ -193,11 +201,13 @@
font-size: 30rpx; font-size: 30rpx;
color: #282828; color: #282828;
} }
.searchGood .title { .searchGood .title {
position: relative; position: relative;
font-size: 28rpx; font-size: 28rpx;
color: #282828; color: #282828;
margin: 50rpx 30rpx 25rpx 30rpx; margin: 50rpx 30rpx 25rpx 30rpx;
.icon-shanchu { .icon-shanchu {
position: absolute; position: absolute;
right: 0; right: 0;
@ -206,10 +216,12 @@
color: #999; color: #999;
} }
} }
.searchGood .list { .searchGood .list {
padding: 0 10rpx; padding: 0 10rpx;
overflow: hidden; overflow: hidden;
} }
.searchGood .list .item { .searchGood .list .item {
font-size: 26rpx; font-size: 26rpx;
color: #666; color: #666;
@ -221,10 +233,12 @@
margin: 0 0 20rpx 20rpx; margin: 0 0 20rpx 20rpx;
max-width: 150rpx; max-width: 150rpx;
} }
.searchGood .line { .searchGood .line {
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
margin: 20rpx 30rpx 0 30rpx; margin: 20rpx 30rpx 0 30rpx;
} }
.more-btn { .more-btn {
display: flex; display: flex;
align-items: center; align-items: center;
@ -233,6 +247,7 @@
height: 60rpx; height: 60rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
.iconfont { .iconfont {
font-size: 22rpx; font-size: 22rpx;
margin-left: 10rpx; margin-left: 10rpx;

3
pages/store/home/index.vue
View File

@ -153,7 +153,8 @@
<view class="text on acea-row row-between-wrapper"> <view class="text on acea-row row-between-wrapper">
<view class="name line1"> <view class="name line1">
<text class="name_text line1">{{ item.store_name }}</text> <text class="name_text line1">{{ item.store_name }}</text>
<text class="sale_num">已销 {{item.sales}}{{item.sales>0?'+':''}}</text> <text v-if="item.sales>0"
class="sale_num">已销{{item.sales}}{{item.sales>0?'+':''}}</text>
</view> </view>
<!-- 标签 --> <!-- 标签 -->

87
pages/whole_sale/index.vue
View File

@ -197,16 +197,19 @@
} }
} }
} }
.pictrue { .pictrue {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
color: #999; color: #999;
image { image {
width: 414rpx; width: 414rpx;
height: 305rpx; height: 305rpx;
} }
} }
.goods_list { .goods_list {
.goods { .goods {
// width: 690rpx; // width: 690rpx;
@ -253,6 +256,36 @@
display: flex; display: flex;
font-size: 24rpx; font-size: 24rpx;
color: #666; color: #666;
.score {
display: flex;
align-items: center;
font-weight: 500;
font-size: 24rpx;
line-height: 1;
color: #FFFFFF;
.star {
position: relative;
width: 111rpx;
height: 19rpx;
background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
overflow: hidden;
view {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
&.star_purple {
background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
}
}
}
}
} }
} }
} }
@ -270,8 +303,8 @@
<scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1"> <scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1">
<view class="scrollview"> <view class="scrollview">
<block v-for="(item,indx) in tabsArr" :key="indx"> <block v-for="(item,indx) in tabsArr" :key="indx">
<view class="scrollview-item" :id="'a' + indx" :class="{'scrollview-active':tabsCurr == item.val}" <view class="scrollview-item" :id="'a' + indx"
@click="tabsChange(item.val)"> :class="{'scrollview-active':tabsCurr == item.val}" @click="tabsChange(item.val)">
{{item.name}} {{item.name}}
</view> </view>
</block> </block>
@ -281,17 +314,21 @@
<!-- 内容 --> <!-- 内容 -->
<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);"> <view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);">
<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection" activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection> <u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection"
activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
<view class="wholeSale-nav"> <view class="wholeSale-nav">
<!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> --> <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
<!-- 搜索 --> <!-- 搜索 -->
<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=0 || (subCurr==0 && tabsCurr!=2) ? false : true}`)" <view
@click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
hover-class="none" class="search_content flex_a_c_j_sb"> hover-class="none" class="search_content flex_a_c_j_sb">
<view class="flex_a_c search_content_wrap"> <view class="flex_a_c search_content_wrap">
<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view> <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
<input type="text" :placeholder="subCurr!=0 || (subCurr==0 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'" :value="where.keyword" <input type="text"
placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;"> :placeholder="subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'"
:value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;" disabled
style="pointer-events: none;">
</view> </view>
<!-- <button class="search_btn">搜索</button> --> <!-- <button class="search_btn">搜索</button> -->
</view> </view>
@ -304,8 +341,9 @@
<block v-for="(item,index) in store_category" :key="index"> <block v-for="(item,index) in store_category" :key="index">
<view class="category-item" :class="{'category-item-active': index==cate_change}" <view class="category-item" :class="{'category-item-active': index==cate_change}"
@click="changeCate(index)"> @click="changeCate(index)">
<block v-if="subCurr!=0 || (subCurr==0 && tabsCurr!=2)"> <block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle"> <u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
shape="circle">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#999" size="15" /> <u-loading-icon color="#999" size="15" />
</template> </template>
@ -313,7 +351,8 @@
<text class="category-item-text">{{item.cate_name}}</text> <text class="category-item-text">{{item.cate_name}}</text>
</block> </block>
<block v-else> <block v-else>
<u--image class="category-item-img" width="108rpx" :src="item.background" height="108rpx" shape="circle"> <u--image class="category-item-img" width="108rpx" :src="item.background"
height="108rpx" shape="circle">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#999" size="15" /> <u-loading-icon color="#999" size="15" />
</template> </template>
@ -342,7 +381,7 @@
</view> </view>
<!-- 综合查询 --> <!-- 综合查询 -->
<view class="comprehensive" v-if="subCurr!=0 || (subCurr==0 && tabsCurr!=2)"> <view class="comprehensive" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)"> <view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
<text>价格</text> <text>价格</text>
<image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;" <image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
@ -350,7 +389,8 @@
</image> </image>
<view v-else style="width: 15rpx;height: 21rpx;"></view> <view v-else style="width: 15rpx;height: 21rpx;"></view>
</view> </view>
<view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}" @click="toOrder('sales', 2)"> <view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}"
@click="toOrder('sales', 2)">
<text>销量</text> <text>销量</text>
</view> </view>
<view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1" <view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1"
@ -387,7 +427,8 @@
</view> </view>
<!-- 流水瀑布 --> <!-- 流水瀑布 -->
<WaterfallsFlow v-if="subCurr!=0 || (subCurr==0 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="2" /> <WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail"
:type="0" :sale_type="2" />
<!-- 列表 --> <!-- 列表 -->
@ -405,17 +446,20 @@
<view class="content"> <view class="content">
<view class="content-head"> <view class="content-head">
<view class="title">{{item.mer_name}}</view> <view class="title">{{item.mer_name}}</view>
<text style="font-size: 21.03rpx;color: #aaa;" v-if="item.sales>=100">月销{{item.sales}}</text> <text style="font-size: 21.03rpx;color: #aaa;"
v-if="item.sales>=100">月销{{item.sales}}</text>
</view> </view>
<view class="content-two"> <view class="content-two">
<view class="score"> <view class="score">
<view class="star"> <view class="star">
<view <view
:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}"> :style="{ height:'26rpx', width: ((item.service_score / 5) * 222).toFixed(0) + 'rpx', backgroundImage:`url(${domain}/static/diy/score1${keyColor}.png)`}">
</view> </view>
</view> </view>
</view> </view>
<text style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text> <text
style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
<text v-if="item.distance" <text v-if="item.distance"
style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text> style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
</view> </view>
@ -423,8 +467,8 @@
<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx" <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
height="33.85rpx"></u--image> height="33.85rpx"></u--image>
<text> {{item.service_phone}}</text> <text> {{item.service_phone}}</text>
<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx" <u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
height="33.85rpx"></u--image> src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text> <text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
</view> </view>
<view class="content-two"> <view class="content-two">
@ -437,7 +481,8 @@
</view> </view>
<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0"></loadmore> <loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0">
</loadmore>
<view class='pictrue' v-if="!isLoading && hostProduct.length == 0"> <view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
<image :src="`${domain}/static/images/noCart.png`"></image> <image :src="`${domain}/static/images/noCart.png`"></image>
<view>暂无商品，看点别的吧</view> <view>暂无商品，看点别的吧</view>
@ -495,7 +540,7 @@
}], }],
tabsCurr: 1, tabsCurr: 1,
orderCurr: 3, //当前选择的排序类型 orderCurr: 3, //当前选择的排序类型
subList: ['批发商户', '批发市场'], subList: ['批发市场', '批发商户'],
subCurr: 0, subCurr: 0,
newData: {}, newData: {},
activeRouter: '', activeRouter: '',
@ -543,7 +588,7 @@
methods: { methods: {
initData(re = false, stop = false) { initData(re = false, stop = false) {
if (!stop) this.getStoreCategory(); if (!stop) this.getStoreCategory();
if (this.tabsCurr==2&&this.subCurr==0) this.storeMerchantList(re, stop); if (this.tabsCurr == 2 && this.subCurr == 1) this.storeMerchantList(re, stop);
else this.getProductslist(re, stop); else this.getProductslist(re, stop);
}, },
changeDeduction(e) { changeDeduction(e) {
@ -558,7 +603,7 @@
sale_type: this.where.sale_type, sale_type: this.where.sale_type,
keyword: this.where.keyword, keyword: this.where.keyword,
} }
if(this.subCurr!=0) this.where.mer_type = 2; if (this.subCurr != 1) this.where.mer_type = 2;
this.cate_change = 0; this.cate_change = 0;
this.cate_change_children = 0; this.cate_change_children = 0;
this.initData(true); this.initData(true);