From 752706144467162054281a5682eaa3912d036e2c Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Sun, 7 Apr 2024 17:16:33 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WaterfallsFlowItem/WaterfallsFlowItem.vue | 800 +++++-----
components/popups/index.vue | 8 +-
pages.json | 51 +-
pages/admin/storeDiy/index.vue | 301 +++-
pages/cloud_warehouse/home/home.vue | 335 ++--
pages/columnGoods/goods_search/index.vue | 192 ++-
pages/payment/get_payment.vue | 9 +-
pages/payment/settlement.vue | 2 +-
pages/plantGrass/plant_search/index.vue | 37 +-
pages/store/home/index.vue | 3 +-
pages/whole_sale/index.vue | 1393 +++++++++--------
11 files changed, 1697 insertions(+), 1434 deletions(-)
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
index 715c816..5dd8152 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItem.vue
@@ -1,447 +1,451 @@
-
-
-
- 已售罄
-
-
-
-
- {{item.store_name}}
-
- {{item.store_info}}
-
-
-
- {{e}}
-
-
+ {{e}}
+
+
+
- {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}
- 领券
- 包邮
-
-
- ￥{{item.price}}/{{item.unit_name}}
-
-
-
- ￥{{item.svip_price}}
-
-
-
-
-
-
-
-
-
- 已售罄
-
-
-
-
- {{item.store_name}}
-
- {{item.store_info}}
-
-
- 批发价
-
-
+
- {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}
- 领券
- 包邮
-
-
- ￥{{item.price}}
-
-
- ￥{{item.svip_price}}
-
-
-
-
- {{item.rate}}评分 {{item.reply_count}}条评论
-
- {{item.merchant.mer_name}}
-
- 进店
-
-
-
-
-
-
-
-
-
+ {{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}
+ 领券
+ 包邮
+
+
+ ￥{{item.price}}
+
+
+ ￥{{item.svip_price}}
+
+
+
+
+ {{item.rate}}评分 {{item.reply_count}}条评论
+
+ {{item.merchant.mer_name}}
+
+ 进店
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/popups/index.vue b/components/popups/index.vue
index 99c0f4c..cbc2b11 100644
--- a/components/popups/index.vue
+++ b/components/popups/index.vue
@@ -220,14 +220,14 @@
.keyboard-right-clear {
width: 100%;
- height: 240rpx;
- line-height: 226rpx;
+ height: 120rpx;
+ line-height: 120rpx;
}
.keyboard-right-pay {
width: 100%;
- height: 240rpx;
- line-height: 226rpx;
+ height: 360rpx;
+ line-height: 360rpx;
text-align: center;
background-color: #40AE36;
color: #fff !important;
diff --git a/pages.json b/pages.json
index 3aa90c7..4cc5606 100644
--- a/pages.json
+++ b/pages.json
@@ -57,28 +57,28 @@
"navigationStyle": "custom"
}
},
- {
- "path": "uni_modules/guyue-updater/pages/updater",
- "style": {
- "app-plus": {
- "animationDuration": 200,
- "animationType": "fade-in",
- "background": "transparent",
- "backgroundColorTop": "transparent",
- "bounce": "none",
- "popGesture": "none",
- "scrollIndicator": false,
- "titleNView": false
- },
- "backgroundColor": "transparent",
- "disableScroll": true,
- "navigationStyle": "custom"
- }
- },
+ {
+ "path": "uni_modules/guyue-updater/pages/updater",
+ "style": {
+ "app-plus": {
+ "animationDuration": 200,
+ "animationType": "fade-in",
+ "background": "transparent",
+ "backgroundColorTop": "transparent",
+ "bounce": "none",
+ "popGesture": "none",
+ "scrollIndicator": false,
+ "titleNView": false
+ },
+ "backgroundColor": "transparent",
+ "disableScroll": true,
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/payment/get_payment",
"style": {
- "navigationBarTitleText": "提货付款",
+ "navigationBarTitleText": "支付",
"navigationStyle": "custom"
}
},
@@ -282,12 +282,11 @@
}
},
{
- "path" : "pages/newActivity/share/share",
- "style" :
- {
- "navigationBarTitleText" : "",
- "enablePullDownRefresh" : false
- }
+ "path": "pages/newActivity/share/share",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
}
],
"subPackages": [{
@@ -579,7 +578,7 @@
"path": "order_list/index",
"style": {
"navigationBarTitleText": "我的订单",
- "navigationStyle": "custom"
+ "navigationStyle": "custom"
}
},
{
diff --git a/pages/admin/storeDiy/index.vue b/pages/admin/storeDiy/index.vue
index fcd0461..606f8c0 100644
--- a/pages/admin/storeDiy/index.vue
+++ b/pages/admin/storeDiy/index.vue
@@ -1,6 +1,7 @@
-
+
@@ -26,7 +27,8 @@
{{ select.selected ? '评分' : '默认' }}
-
+
@@ -35,20 +37,24 @@
价格
-
+
+
-
+
-
- {{ item.name }}
-
-
+
+ {{ item.name }}
+
+
@@ -82,7 +88,8 @@
+ :style="{width: `${score.star.toFixed(2)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+
{{ score.number.toFixed(1) }}
@@ -110,7 +117,8 @@
{{ select.selected ? '评分' : '默认' }}
-
+
@@ -121,21 +129,24 @@
价格
-
-
+
+
-
+
- {{ item.name }}
-
-
+ {{ item.name }}
+
+
@@ -155,9 +166,10 @@
-
+
{{ item.name }}
-
+
@@ -167,19 +179,14 @@
-
+
-
+
@@ -187,10 +194,12 @@
-
-
+
+
-
+
+
@@ -227,14 +236,32 @@
import request from "@/utils/request.js";
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
- import {getStoreDetail, getStoreGoods, getStoreCategory, storeServiceList, 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 {
+ getStoreDetail,
+ getStoreGoods,
+ getStoreCategory,
+ storeServiceList,
+ 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 { HTTP_REQUEST_URL } from '@/config/app';
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
import mConfig from '../../store/component/index.js';
// #ifdef MP || APP-PLUS
import activeParty from '../../index/component/activeParty';
@@ -254,7 +281,7 @@
import pictureCube from '../../index/component/pictureCube'
import titles from '../../index/component/titles';
// #endif
- const app = getApp();
+ const app = getApp();
export default {
components: {
...mConfig,
@@ -389,7 +416,8 @@
number: 0
};
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;
score.star = score.number / 5 * 100;
}
@@ -398,10 +426,10 @@
...configMap({
margin_ico_switch: 0,
margin_ico: '',
- }, mapGetters(['isLogin','uid','viewColor','keyColor'])),
+ }, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
},
watch: {
-
+
},
onLoad: function(options) {
this.type = parseInt(options.type) || 1
@@ -413,7 +441,7 @@
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
},
onShow() {
-
+
},
onReady: function() {
@@ -435,7 +463,11 @@
// 获取diy模板数据
diyData() {
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;
that.styleConfig = that.objToArr(data.value);
uni.setNavigationBarTitle({
@@ -445,7 +477,7 @@
uni.showToast({
title: err,
icon: 'none'
- });
+ });
});
},
// 对象转数组
@@ -458,24 +490,25 @@
getStore: function() {
getStoreDetail(this.id).then(res => {
this.store = res.data;
- if(this.id == 0){
+ if (this.id == 0) {
this.tabs = this.tabs1
- }else{
- if((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way.length == 2){
+ } else {
+ if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data
+ .delivery_way.length == 2) {
this.tabs = this.tabs1
this.service_open = true
- }else{
+ } else {
this.tabs = this.tabs2
this.service_open = false
- }
- }
+ }
+ }
}).catch(err => {
this.loading = false;
uni.showToast({
title: err,
icon: 'none'
})
-
+
})
},
// 获取商铺商品
@@ -510,29 +543,31 @@
},
// 去商品详情页
goGoodsDetail(item) {
-
+
},
// 商铺首页滚动 navbar 吸顶
scrollHome: function(e) {
uni.$emit('scroll');
this.navShow = e.detail.scrollTop >= 50;
},
-
+
},
}
+
\ No newline at end of file
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 35d4547..681b7b7 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -4,7 +4,8 @@
}
.wholeSale {
- background-color: #f8fafb !important;
+ background-color: #f8fafb !important;
+
.wholeSale-header {
margin-bottom: 20rpx;
// background-color: #40AE36;
@@ -44,19 +45,20 @@
.wholeSale-con {
margin: 0 20rpx;
-
- .wholeSale-nav{
- display: flex;
- align-items: center;
+
+ .wholeSale-nav {
+ display: flex;
+ align-items: center;
margin-bottom: 40rpx;
- .icon{
- margin-right: 20rpx;
- }
- }
-
+
+ .icon {
+ margin-right: 20rpx;
+ }
+ }
+
.search_content {
// margin-bottom: 40rpx;
- flex: 1;
+ flex: 1;
height: 70rpx;
padding: 2px 2px 2px 21.05rpx;
border-radius: 80rpx;
@@ -96,47 +98,47 @@
margin-bottom: 20rpx;
.category-wrap {
- display: flex;
- padding-bottom: 20rpx;
-
- .category-item {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- margin-right: 38rpx;
-
- text {
- margin-top: 16rpx;
- font-size: 24rpx;
- color: #666666;
- white-space: nowrap;
- }
-
- .category-item-text {
- width: 120rpx;
- text-align: center;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
- }
-
- .category-item-active {
- position: relative;
-
- .category-item-img {
- border: 2px solid #40AE36;
- border-radius: 50%;
- }
-
- text {
- background-color: #40AE36;
- color: #fff;
- padding: 2rpx 10rpx 6rpx 10rpx;
- border-radius: 50rpx;
- }
- }
+ display: flex;
+ padding-bottom: 20rpx;
+
+ .category-item {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ margin-right: 38rpx;
+
+ text {
+ margin-top: 16rpx;
+ font-size: 24rpx;
+ color: #666666;
+ white-space: nowrap;
+ }
+
+ .category-item-text {
+ width: 120rpx;
+ text-align: center;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+
+ .category-item-active {
+ position: relative;
+
+ .category-item-img {
+ border: 2px solid #40AE36;
+ border-radius: 50%;
+ }
+
+ text {
+ background-color: #40AE36;
+ color: #fff;
+ padding: 2rpx 10rpx 6rpx 10rpx;
+ border-radius: 50rpx;
+ }
+ }
}
}
@@ -199,40 +201,43 @@
}
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -249,7 +254,8 @@
-
+
{{item.cate_name}}
@@ -274,7 +280,7 @@
-
+
@@ -284,109 +290,110 @@
goShopDetail
} from '@/libs/order.js'
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
- import {
- getStoreCategory,
- getProductslist
- } from "@/api/store.js"
+ import {
+ getStoreCategory,
+ getProductslist
+ } from "@/api/store.js"
export default {
components: {
WaterfallsFlow
},
data() {
return {
- hostProduct: [],
- store_category: [], //商品大分类
- store_category_children: [], //商品小分类
- cate_change: 0,
- cate_change_children: 0,
- isLoading: 0,
- where:{
- page: 1,
- limit: 20,
- mer_type: 1, //1-里海云仓, 2-云市场, 3-名优特产
- mer_cate_id: '',
- keyword: '',
- deduction_rate: '', //抵扣比例
- }
+ hostProduct: [],
+ store_category: [], //商品大分类
+ store_category_children: [], //商品小分类
+ cate_change: 0,
+ cate_change_children: 0,
+ isLoading: 0,
+ where: {
+ page: 1,
+ limit: 20,
+ mer_type: 1, //1-里海云仓, 2-云市场, 3-名优特产
+ mer_cate_id: '',
+ keyword: '',
+ deduction_rate: '', //抵扣比例
+ }
}
},
- onLoad(option){
- this.getStoreCategory();
- this.getProductslist(true);
- },
- onReachBottom() {
- this.getProductslist();
- },
- onPageScroll() {
- uni.$emit('scroll');
- },
+ onLoad(option) {
+ this.getStoreCategory();
+ this.getProductslist(true);
+ },
+ onReachBottom() {
+ this.getProductslist();
+ },
+ onPageScroll() {
+ uni.$emit('scroll');
+ },
methods: {
- navTo(url){
- uni.navigateTo({
- url:url,
- success: () => {
- uni.$once('searchValue', (e)=>{
- this.$nextTick(()=>{
- this.where.keyword = e;
- this.getProductslist(true);
- })
- })
- }
- })
- },
- navBack(){
- uni.navigateBack();
- },
+ navTo(url) {
+ uni.navigateTo({
+ url: url,
+ success: () => {
+ uni.$once('searchValue', (e) => {
+ this.$nextTick(() => {
+ this.where.keyword = e;
+ this.getProductslist(true);
+ })
+ })
+ }
+ })
+ },
+ navBack() {
+ uni.navigateBack();
+ },
tabsChange(e) {
this.tabsCurr = e;
},
- changeCate(e){
- this.cate_change = e;
- this.store_category_children = [];
- if(this.store_category[e].children) this.store_category_children = [...this.store_category[e].children];
- this.store_category_children.unshift({
- cate_name: '全部',
- store_category_id: ''
- })
- this.cate_change_children = 0;
- this.where.mer_cate_id = this.store_category[e].store_category_id;
- this.getProductslist(true);
- },
- changeChildrenCate(e){
- this.cate_change_children = e;
- 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
- this.getProductslist(true);
- },
- getStoreCategory(){
- getStoreCategory(259).then(res=>{
- this.store_category = [{
- cate_name: '全部',
- pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
- store_category_id: ''
- }, ...res.data];
- this.store_category_children = this.store_category[0].children || [];
- this.store_category_children.unshift({
- cate_name: '全部',
- store_category_id: ''
- })
- })
- },
- getProductslist(reLoad=false){
- if(reLoad){
- this.where.page = 1;
- this.hostProduct = [];
- this.isLoading = 0;
- }
- if(this.isLoading==-1)return;
- this.isLoading = 1;
- getProductslist(this.where).then(res=>{
- this.hostProduct = [...this.hostProduct, ...res.data.list];
- this.isLoading = 0;
- if(res.data.list.length {
+ this.store_category = [{
+ cate_name: '全部',
+ pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
+ store_category_id: ''
+ }, ...res.data];
+ this.store_category_children = this.store_category[0].children || [];
+ this.store_category_children.unshift({
+ cate_name: '全部',
+ store_category_id: ''
+ })
+ })
+ },
+ getProductslist(reLoad = false) {
+ if (reLoad) {
+ this.where.page = 1;
+ this.hostProduct = [];
+ this.isLoading = 0;
+ }
+ if (this.isLoading == -1) return;
+ this.isLoading = 1;
+ getProductslist(this.where).then(res => {
+ this.hostProduct = [...this.hostProduct, ...res.data.list];
+ this.isLoading = 0;
+ if (res.data.list.length < this.where.limit) this.isLoading = -1;
+ this.where.page++;
+ })
+ },
goDetail(item) {
goShopDetail(item, this.uid).then(res => {
if (this.isLogin) {
diff --git a/pages/columnGoods/goods_search/index.vue b/pages/columnGoods/goods_search/index.vue
index 64e7bb9..edf90d3 100644
--- a/pages/columnGoods/goods_search/index.vue
+++ b/pages/columnGoods/goods_search/index.vue
@@ -4,8 +4,8 @@
-
+
搜索
@@ -25,7 +25,9 @@
暂无搜索历史~
- 热门搜索
+
+
+
-
+ -->
+
+
+ 热销排行
@@ -110,8 +112,8 @@
开启热搜榜
-
-
+ -->
+
@@ -129,17 +131,34 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
- import { getSearchKeyword,copyPasswordSearch,getTodayHotSearch,getHotRanking } from '@/api/store.js';
+ import {
+ getSearchKeyword,
+ copyPasswordSearch,
+ getTodayHotSearch,
+ getHotRanking
+ } from '@/api/store.js';
import shareScence from '@/libs/spread';
- import { silenceBindingSpread } from '@/utils';
- import { goShopDetail } from '@/libs/order.js';
- import { initiateAssistApi } from '@/api/activity.js';
- import { mapGetters } from 'vuex';
- import { HTTP_REQUEST_URL } from '@/config/app';
+ import {
+ silenceBindingSpread
+ } from '@/utils';
+ import {
+ goShopDetail
+ } from '@/libs/order.js';
+ import {
+ initiateAssistApi
+ } from '@/api/activity.js';
+ import {
+ mapGetters
+ } from 'vuex';
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
// #ifndef H5
import passwordPopup from '@/components/passwordPopup';
// #endif
- import { toLogin } from '@/libs/login.js';
+ import {
+ toLogin
+ } from '@/libs/login.js';
export default {
computed: mapGetters(['isLogin', 'uid']),
components: {
@@ -173,19 +192,19 @@
hotSearchBox: false,
mainWidth: 960,
isShow: true,
- back: false,
- isShop: false,
+ back: false,
+ isShop: false,
};
},
onLoad(options) {
this.searchValue = options.searchVal || ''
- this.back = options.back;
- if(options.shop=='true'){
- this.isShop = options.shop;
- uni.setNavigationBarTitle({
- title: '搜索店铺'
- })
- }
+ this.back = options.back;
+ if (options.shop == 'true') {
+ this.isShop = options.shop;
+ uni.setNavigationBarTitle({
+ title: '搜索店铺'
+ })
+ }
},
onShow: function() {
try {
@@ -230,13 +249,13 @@
});
},
/*今日热搜*/
- getHotSearchList(){
+ getHotSearchList() {
getTodayHotSearch().then(res => {
this.$set(this, 'daySearchList', res.data);
});
},
/*热销排行*/
- getHotRankingList(){
+ getHotRankingList() {
getHotRanking().then(res => {
this.$set(this, 'hotRankList', res.data);
});
@@ -257,19 +276,21 @@
this.$set(this, 'searchValue', event.detail.value);
},
searchBut: function() {
- if(this.back) {
- return uni.navigateBack({
- success: () => {
- uni.$emit('searchValue', this.searchValue)
- }
- })
- }
- if(/^(\/@[1-9]{1}).*\*\//.test(this.searchValue)){
+ if (this.back) {
+ return uni.navigateBack({
+ success: () => {
+ uni.$emit('searchValue', this.searchValue)
+ }
+ })
+ }
+ if (/^(\/@[1-9]{1}).*\*\//.test(this.searchValue)) {
uni.showLoading({
title: '加载中',
mask: true
});
- copyPasswordSearch({key: this.searchValue}).then(res => {
+ copyPasswordSearch({
+ key: this.searchValue
+ }).then(res => {
uni.hideLoading();
let item = res.data
shareScence(res.data.user.uid, this.isLogin);
@@ -283,9 +304,10 @@
let id = res.data.product_assist_set_id;
uni.hideLoading();
uni.navigateTo({
- url: '/pages/activity/assist_detail/index?id=' + id
+ url: '/pages/activity/assist_detail/index?id=' +
+ id
});
-
+
})
.catch(err => {
uni.showToast({
@@ -294,7 +316,7 @@
});
});
} else {
- toLogin()
+ toLogin()
}
})
}).catch(err => {
@@ -304,7 +326,7 @@
});
this.searchValue = ""
});
- }else{
+ } else {
let status = false
this.tempStorage.forEach((el, index) => {
if (el == this.searchValue) {
@@ -335,9 +357,11 @@
.searchGood .search {
padding-left: 30rpx;
}
+
.searchGood .search {
margin-top: 20rpx;
}
+
.searchGood .search .input {
width: 598rpx;
background-color: #f7f7f7;
@@ -346,17 +370,21 @@
box-sizing: border-box;
height: 66rpx;
}
+
.searchGood .search .input input {
width: 472rpx;
font-size: 28rpx;
}
+
.searchGood .search .input .placeholder {
color: #bbb;
}
+
.searchGood .search .input .iconfont {
color: #000;
font-size: 35rpx;
}
+
.searchGood .search .bnt {
width: 120rpx;
text-align: center;
@@ -365,11 +393,13 @@
font-size: 30rpx;
color: #282828;
}
+
.searchGood .title {
position: relative;
font-size: 28rpx;
color: #282828;
margin: 50rpx 30rpx 25rpx 30rpx;
+
.icon-shanchu {
position: absolute;
right: 0;
@@ -378,10 +408,12 @@
color: #999;
}
}
+
.searchGood .list {
padding: 0 10rpx;
overflow: hidden;
}
+
.searchGood .list .item {
font-size: 26rpx;
color: #666;
@@ -393,10 +425,12 @@
margin: 0 0 20rpx 20rpx;
max-width: 150rpx;
}
+
.searchGood .line {
border-bottom: 1rpx solid #eee;
margin: 20rpx 30rpx 0 30rpx;
}
+
.more-btn {
display: flex;
align-items: center;
@@ -405,97 +439,117 @@
height: 60rpx;
font-size: 24rpx;
color: #999;
+
.iconfont {
font-size: 22rpx;
margin-left: 10rpx;
}
}
- .search-hot{
+
+ .search-hot {
padding: 0 30rpx 30rpx;
padding-bottom: calc(30rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
padding-bottom: calc(30rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
- scroll-view{
- width:100%;
+
+ scroll-view {
+ width: 100%;
}
- /deep/.uni-scroll-view-content{
+
+ /deep/.uni-scroll-view-content {
display: flex;
}
}
- .scroll-item{
+
+ .scroll-item {
border: 1px solid #FFECEC;
border-radius: 16rpx;
background-repeat: no-repeat;
background-size: 100% auto;
height: 980rpx;
}
- .scroll-count{
+
+ .scroll-count {
display: inline-block;
width: 450rpx;
margin-right: 30rpx;
- vertical-align:top;
- &:last-child{
+ vertical-align: top;
+
+ &:last-child {
margin-right: 0;
}
- .search-title{
+
+ .search-title {
padding: 20rpx 20rpx 32rpx;
color: #E93323;
font-size: 28rpx;
font-weight: bold;
display: flex;
align-items: center;
- .title-icon{
+
+ .title-icon {
width: 30rpx;
height: 30rpx;
margin-right: 10rpx;
- }
+ }
}
- .search-list{
+
+ .search-list {
padding: 0 20rpx 40rpx;
position: relative;
top: -15rpx;
}
- .search-item{
+
+ .search-item {
display: flex;
align-items: center;
margin-bottom: 20rpx;
- &:nth-child(n+3){
+
+ &:nth-child(n+3) {
margin-bottom: 0;
}
- .list-more{
+
+ .list-more {
display: flex;
align-items: center;
margin-top: 40rpx;
}
- .picture{
+
+ .picture {
width: 106rpx;
height: 106rpx;
border-radius: 10rpx;
position: relative;
- .image{
+
+ .image {
width: 100%;
height: 100%;
border-radius: 10rpx;
}
}
- .list-info{
+
+ .list-info {
max-width: 260rpx;
margin-left: 20rpx;
}
- .title{
+
+ .title {
margin: 0;
color: #282828;
font-size: 26rpx;
- &.titleml{
+
+ &.titleml {
margin-left: 15rpx;
max-width: 360rpx;
}
}
- .info{
+
+ .info {
font-size: 22rpx;
color: #999999;
}
}
- .list-num{
+
+ .list-num {
width: 28rpx;
height: 31rpx;
display: flex;
@@ -504,16 +558,19 @@
font-size: 20rpx;
color: #ffffff;
background-size: 100% 100%;
- &.num-pic{
+
+ &.num-pic {
position: absolute;
top: 0;
left: 0;
}
}
}
- .search-hot-switch{
+
+ .search-hot-switch {
margin-top: 20rpx;
- .switch{
+
+ .switch {
border: 1px solid #CCCCCC;
border-radius: 22rpx;
display: flex;
@@ -523,13 +580,14 @@
height: 43rpx;
color: #666666;
font-size: 20rpx;
- .iconfont{
+
+ .iconfont {
font-size: 24rpx;
margin-right: 10rpx;
position: relative;
// top: 1rpx;
}
}
-
+
}
\ No newline at end of file
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index f0bfbb8..1a0ec28 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -2,7 +2,7 @@
-
@@ -49,11 +49,12 @@
-->
-
-
+
+
+
优惠明细
- {{'提交订单'}}
+ {{'立即支付'}}
diff --git a/pages/plantGrass/plant_search/index.vue b/pages/plantGrass/plant_search/index.vue
index 6d1ea97..86d57a9 100644
--- a/pages/plantGrass/plant_search/index.vue
+++ b/pages/plantGrass/plant_search/index.vue
@@ -4,8 +4,9 @@
-
+
取消
@@ -24,20 +25,20 @@
暂无搜索历史~
- 热门搜索
+
+
@@ -52,7 +53,9 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
- import { hotSearchLst } from '@/api/community.js';
+ import {
+ hotSearchLst
+ } from '@/api/community.js';
export default {
data() {
return {
@@ -144,12 +147,12 @@
try {
uni.setStorageSync('historyPlant', this.tempStorage);
} catch (e) {}
-
+
uni.navigateTo({
url: '/pages/plantGrass/plant_search_list/index?searchValue=' + this.searchValue
- })
+ })
},
- searchCancle(){
+ searchCancle() {
uni.navigateBack();
}
}
@@ -166,6 +169,7 @@
padding-left: 30rpx;
margin-top: 20rpx;
}
+
.searchGood .search .input {
width: 598rpx;
background-color: #f7f7f7;
@@ -174,17 +178,21 @@
box-sizing: border-box;
height: 66rpx;
}
+
.searchGood .search .input input {
width: 472rpx;
font-size: 28rpx;
}
+
.searchGood .search .input .placeholder {
color: #bbb;
}
+
.searchGood .search .input .iconfont {
color: #000;
font-size: 35rpx;
}
+
.searchGood .search .bnt {
width: 120rpx;
text-align: center;
@@ -193,11 +201,13 @@
font-size: 30rpx;
color: #282828;
}
+
.searchGood .title {
position: relative;
font-size: 28rpx;
color: #282828;
margin: 50rpx 30rpx 25rpx 30rpx;
+
.icon-shanchu {
position: absolute;
right: 0;
@@ -206,10 +216,12 @@
color: #999;
}
}
+
.searchGood .list {
padding: 0 10rpx;
overflow: hidden;
}
+
.searchGood .list .item {
font-size: 26rpx;
color: #666;
@@ -221,10 +233,12 @@
margin: 0 0 20rpx 20rpx;
max-width: 150rpx;
}
+
.searchGood .line {
border-bottom: 1rpx solid #eee;
margin: 20rpx 30rpx 0 30rpx;
}
+
.more-btn {
display: flex;
align-items: center;
@@ -233,9 +247,10 @@
height: 60rpx;
font-size: 24rpx;
color: #999;
+
.iconfont {
font-size: 22rpx;
margin-left: 10rpx;
}
}
-
+
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 4debee5..dc8c706 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -153,7 +153,8 @@
{{ item.store_name }}
- 已销 {{item.sales}}{{item.sales>0?'+':''}}
+ 已销{{item.sales}}{{item.sales>0?'+':''}}
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 619acb5..8882f59 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -1,728 +1,773 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.cate_name}}
-
-
-
-
-
-
-
- {{item.category_name}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{item.cate_name}}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.cate_name}}
+
+
+
+
+
+
+
+ {{item.category_name}}
+
+
+
+
+
+
-
-
-
- 价格
-
-
-
-
-
- 销量
-
-
- 综合
-
-
- 抵扣
-
-
-
-
-
-
- 全部
-
-
- 1:9
-
-
- 2:8
-
-
- 3:7
-
-
- 4:6
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{item.cate_name}}
+
+
+
+
+
+
+
+
+
+ 价格
+
+
+
+
+
+ 销量
+
+
+ 综合
+
+
+ 抵扣
+
+
+
+
+
+
+ 全部
+
+
+ 1:9
+
+
+ 2:8
+
+
+ 3:7
+
+
+ 4:6
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- 月销{{item.sales}}
-
-
-
-
-
-
-
-
- {{item.service_score}}
- {{item.distance}}
-
-
-
- {{item.service_phone}}
-
- {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
-
-
-
- {{item.mer_address}}
-
-
-
-
-
-
-
-
-
- 暂无商品，看点别的吧
-
-
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ 月销{{item.sales}}
+
+
+
+
-
-
-
+
+
+
+
+ {{item.service_score}}
+ {{item.distance}}
+
+
+
+ {{item.service_phone}}
+
+ {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+
+
+
+ {{item.mer_address}}
+
+
+
+
+
+
+
+
+
+
+ 暂无商品，看点别的吧
+
+
+
+
+
+
\ No newline at end of file