diff --git a/components/WaterfallsFlow/WaterfallsFlow.vue b/components/WaterfallsFlow/WaterfallsFlow.vue
index f5551b0..cd6531f 100644
--- a/components/WaterfallsFlow/WaterfallsFlow.vue
+++ b/components/WaterfallsFlow/WaterfallsFlow.vue
@@ -1,204 +1,206 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .wf-page {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ grid-gap: $grid-gap;
+ }
+
+ .wf-item {
+ width: calc((100vw - 2 * #{$page-padding} - #{$grid-gap}) / 2);
+ padding-bottom: $grid-gap;
+ }
+
+ .wf-page1 .wf-item {
+ margin-top: 20rpx;
+ background-color: #fff;
+ border-radius: 20rpx;
+ padding-bottom: 0;
+ }
+
+ .wf-item-page {
+ padding-bottom: 20rpx;
+ }
+
\ No newline at end of file
diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index 5981aa9..9accddf 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -1,8 +1,50 @@
- 为你推荐
+
+
+
+
+
+
+
+
+
+ 里海云仓
+ 供销物资市场
+
+
+
+
+
+
+
+ 供销云市场
+ 综合线上大市场
+
+
+
+
+
+
+
+ 名优特产
+ 地方特色特产
+
+
+
+
+
+
+
+
+ {{item.name}}
+ {{item.desc}}
+
+
+
+
@@ -19,14 +61,26 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
- import {mapGetters} from "vuex";
- import { goShopDetail } from '@/libs/order.js'
- import {initiateAssistApi} from '@/api/activity.js';
- import {toLogin} from '@/libs/login.js';
+ import {
+ mapGetters
+ } from "vuex";
+ import {
+ goShopDetail
+ } from '@/libs/order.js'
+ import {
+ initiateAssistApi
+ } from '@/api/activity.js';
+ import {
+ toLogin
+ } from '@/libs/login.js';
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
- import { HTTP_REQUEST_URL } from '@/config/app';
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
export default {
- components:{WaterfallsFlow},
+ components: {
+ WaterfallsFlow
+ },
computed: mapGetters(['uid']),
props: {
hostProduct: {
@@ -35,11 +89,11 @@
return [];
}
},
- indexP:{
+ indexP: {
type: Boolean,
default: false
},
- isLogin:{
+ isLogin: {
type: Boolean,
default: false
}
@@ -47,29 +101,52 @@
data() {
return {
domain: HTTP_REQUEST_URL,
+ tabsArr: [{
+ name: '全部',
+ desc: '猜你喜欢',
+ val: 1
+ }, {
+ name: '里海云仓',
+ desc: '大家都在买',
+ val: 2
+ }, {
+ name: '云市场',
+ desc: '商户汇聚',
+ val: 3
+ }, {
+ name: '名优特产',
+ desc: '特色农副',
+ val: 4
+ }],
+ currTabs: 1
};
},
mounted() {
},
- onPullDownRefresh(){
+ onPullDownRefresh() {
// 模拟上拉刷新
- setTimeout(()=>{
+ setTimeout(() => {
const newList = this.hostProduct.reverse();
this.hostProduct = newList;
uni.stopPullDownRefresh();
- },500)
+ }, 500)
},
methods: {
- goDetail(item){
+
+ changeTab(e) {
+ this.currTabs = e;
+ },
+
+ goDetail(item) {
goShopDetail(item, this.uid).then(res => {
- if (this.isLogin) {
+ if (this.isLogin) {
initiateAssistApi(item.activity_id).then(res => {
let id = res.data.product_assist_set_id;
uni.hideLoading();
uni.navigateTo({
url: '/pages/activity/assist_detail/index?id=' + id
- });
+ });
}).catch((err) => {
uni.showToast({
title: err,
@@ -77,7 +154,7 @@
})
});
} else {
- toLogin();
+ toLogin();
}
})
}
@@ -91,7 +168,14 @@
align-items: center;
justify-content: center;
height: 118rpx;
+
+ image {
+ width: 340rpx;
+ height: 42rpx;
+ }
+
.title {
+ height: 42rpx;
padding: 0 80rpx;
font-size: 34rpx;
color: $theme-color;
@@ -101,14 +185,102 @@
background-position: left center;
}
}
+
+ // 里海云仓 供销云市场 名优特产
+ .nav {
+ display: flex;
+ margin-bottom: 40rpx;
+
+ .nav-item {
+ width: 33.3%;
+ overflow: hidden;
+ border-radius: 20rpx;
+
+ &:not(:nth-last-child(1)) {
+ margin-right: 12rpx;
+ }
+
+ .nav-item-up {
+ width: 100%;
+ height: 198rpx;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ }
+
+ .nav-item-down {
+ height: 102rpx;
+ padding: 12rpx 0 0 20rpx;
+ box-sizing: border-box;
+ background: linear-gradient(to right, #72BE53 0%, #46B03A 100%);
+
+ .nav-item-down-title {
+ margin-bottom: 4rpx;
+ font-weight: 600;
+ font-size: 30rpx;
+ color: #FFFFFF;
+ }
+
+ .nav-item-down-desc {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FFFFFF;
+ }
+ }
+ }
+ }
+
+ .tabs {
+ display: flex;
+ justify-content: space-between;
+ margin: 0 -20rpx 30rpx;
+
+ .tabs-item {
+ width: 25%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+
+ .tabs-item-main {
+ font-weight: bold;
+ font-size: 30rpx;
+ color: #333;
+ font-family: PingFangSC-Medium, PingFangSC-Medium;
+ }
+
+ .tabs-item-sub {
+ font-size: 22rpx;
+ color: #999;
+ }
+ }
+
+ .tabs-item-active {
+ .tabs-item-main {
+ color: #40AE36;
+ }
+
+ .tabs-item-sub {
+ padding: 0 12rpx;
+ background-color: #40AE36;
+ color: #fff;
+ border-radius: 20rpx;
+ }
+ }
+ }
+
.recommend .recommendList {
padding: 0 20rpx;
min-height: 100rpx;
}
- .recommend .recommendList.on{
+
+ .recommend .recommendList.on {
padding: 0;
}
- /deep/.looming-gray{
+
+ /deep/.looming-gray {
border-radius: 16rpx 16rpx 0 0;
}
-
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d2cf50e..ead846b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,45 +22,47 @@
"scrollIndicator": false //禁用原生导航栏
}
}
- },
- {
+ }, {
+ "path": "pages/whole_sale/index",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "批发",
+ "navigationStyle": "custom"
+ }
+ }, {
"path": "pages/gather/gather",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "工作台"
+ "navigationBarTitleText": "工作台",
+ "navigationStyle": "custom"
}
- },
- {
+ }, {
"path": "pages/order_addcart/order_addcart",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "购物车"
}
- },
- {
+ }, {
"path": "pages/plant_grass/index",
"style": {
// "navigationStyle": "custom",
"navigationBarTitleText": "种草社区"
}
- },
- {
+ }, {
"path": "pages/user/index",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "个人中心",
"navigationStyle": "custom"
}
- },
- {
+ }, {
"path": "pages/small_page/index",
"style": {
"navigationBarTitleText": "微页面"
// "navigationStyle": "custom",
}
- },
- {
+ }, {
"path": "pages/goods_details/index",
"style": {
"navigationStyle": "custom"
@@ -1441,7 +1443,7 @@
},
"tabBar": {
"color": "#282828",
- "selectedColor": "#E93323",
+ "selectedColor": "#40AE36",
"borderStyle": "white",
"backgroundColor": "#ffffff",
"list": [{
@@ -1450,13 +1452,12 @@
"selectedIconPath": "static/images/1-002.png",
"text": "首页"
},
- // {
- // "pagePath": "pages/goods_cate/goods_cate"
- // ,
- // "iconPath": "static/images/2-001.png",
- // "selectedIconPath": "static/images/2-002.png",
- // "text": "分类"
- // },
+ {
+ "pagePath": "pages/whole_sale/index",
+ "iconPath": "static/images/2-001.png",
+ "selectedIconPath": "static/images/2-002.png",
+ "text": "批发"
+ },
// {
// "pagePath": "pages/plant_grass/index",
// "iconPath": "static/images/5-001.png",
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 371116d..d8a40a7 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,19 +1,194 @@
+
-
-
-
- 更多功能
- 编辑
- 完成
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -21,8 +196,15 @@
- 还没有应用,点我添加应用
+
+
+
+
+ 添加应用
+
@@ -55,9 +237,9 @@
import {
Toast
} from '@/libs/uniApi';
- import {
- applet
- } from '@/api/public.js';
+ import {
+ applet
+ } from '@/api/public.js';
// #ifdef APP-PLUS
import uniMP from '@/utils/uniMP.js';
// #endif
@@ -65,6 +247,9 @@
export default {
data() {
return {
+ imgUrls: [{
+ img: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e2f0520240203154207556.png'
+ }],
locationArr: ({}),
isshow: false,
emptyText: '暂无可用应用',
@@ -95,13 +280,12 @@
...mapGetters(['userInfo', 'location', 'isLogin'])
},
created() {},
- onLoad() {
- },
+ onLoad() {},
onShow() {
if (this.isLogin) {
this.emptyText = '暂无可用应用'
this.jurisdiction = false
- this.initAllAppLet();
+ this.initAllAppLet();
} else {
this.emptyText = '请登录'
this.jurisdiction = true
@@ -112,8 +296,7 @@
this.getUserInfo()
uni.stopPullDownRefresh()
},
- beforeDestroy() {
- },
+ beforeDestroy() {},
mounted() {
},
@@ -132,9 +315,9 @@
}
},
// #endif
- onHide() {
- uni.$emit('showLoading', false);
- },
+ onHide() {
+ uni.$emit('showLoading', false);
+ },
methods: {
scrolling() {
// 滚动条距文档顶部的距离
@@ -177,15 +360,15 @@
},
- initAllAppLet(){
- applet().then(res=>{
- this.AllMenuList = res.data;
- this.initMenu();
- // this.showControllerAllLet();
- }).catch(e=>{
- console.log(e);
- })
- },
+ initAllAppLet() {
+ applet().then(res => {
+ this.AllMenuList = res.data;
+ this.initMenu();
+ // this.showControllerAllLet();
+ }).catch(e => {
+ console.log(e);
+ })
+ },
// 根据类型来判断是否显示
showControllerAllLet() {
let user;
@@ -208,18 +391,18 @@
initMenu() {
let nowMenu = uni.getStorageSync('gatherMenuList');
try {
- let list = JSON.parse(nowMenu||'[]');
- let now = [];
- let all = [];
+ let list = JSON.parse(nowMenu || '[]');
+ let now = [];
+ let all = [];
this.AllMenuList.forEach((item) => {
- if(list.find(t => t.name == item.name)?.name != item.name) all.push(item);
- else now.push(item)
+ if (list.find(t => t.name == item.name)?.name != item.name) all.push(item);
+ else now.push(item)
})
- this.AllMenuList = all;
- this.nowMenuList = now;
+ this.AllMenuList = all;
+ this.nowMenuList = now;
} catch (e) {
this.nowMenuList = [];
- console.log(e);
+ console.log(e);
}
},
clickMenu(data) {
@@ -246,9 +429,9 @@
},
getUniMp(data) {
let that = this;
-
+
// #ifdef APP-PLUS
- if(data.version) return uniMP.loadAppletMP(data);
+ if (data.version) return uniMP.loadAppletMP(data);
else switch (data.type) {
case 1:
uniMP.loadMP(data.data);
@@ -426,7 +609,7 @@
.special_work {
// padding: 17.54rpx;
width: 694.74rpx;
- padding-top: 30rpx;
+ padding-top: 30rpx;
border-radius: 17.54rpx;
// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
@@ -529,37 +712,37 @@
transform: rotate(360deg);
}
- .location {
- background-color: #f6f6f6;
- width: 680rpx;
- height: 150rpx;
- position: absolute;
- top: 0;
- z-index: 9999;
- border-radius: 20rpx;
- left: 50%;
- margin-left: -340rpx;
- margin-top: 80rpx;
- padding-left: 20rpx;
+ // .location {
+ // background-color: #f6f6f6;
+ // width: 680rpx;
+ // height: 150rpx;
+ // position: absolute;
+ // top: 0;
+ // z-index: 9999;
+ // border-radius: 20rpx;
+ // left: 50%;
+ // margin-left: -340rpx;
+ // margin-top: 80rpx;
+ // padding-left: 20rpx;
- .locationa {
- font-size: 28rpx;
- color: #000;
- font-weight: 500;
- margin-top: 30rpx;
- margin-bottom: 15rpx;
- }
+ // .locationa {
+ // font-size: 28rpx;
+ // color: #000;
+ // font-weight: 500;
+ // margin-top: 30rpx;
+ // margin-bottom: 15rpx;
+ // }
- .locationb {
- font-size: 20rpx;
- color: #5a5a5a;
- }
+ // .locationb {
+ // font-size: 20rpx;
+ // color: #5a5a5a;
+ // }
- .locationx {
- color: #000;
- position: absolute;
- top: 10rpx;
- right: 20rpx;
- }
- }
+ // .locationx {
+ // color: #000;
+ // position: absolute;
+ // top: 10rpx;
+ // right: 20rpx;
+ // }
+ // }
\ No newline at end of file
diff --git a/pages/gather/gather_backup.vue b/pages/gather/gather_backup.vue
new file mode 100644
index 0000000..371116d
--- /dev/null
+++ b/pages/gather/gather_backup.vue
@@ -0,0 +1,565 @@
+
+
+
+
+
+ 更多功能
+ 编辑
+ 完成
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+ 还没有应用,点我添加应用
+
+
+
+
+ 编辑功能
+ 完成
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/component/homeComb.vue b/pages/index/component/homeComb.vue
index 77eb49a..aa2ea19 100644
--- a/pages/index/component/homeComb.vue
+++ b/pages/index/component/homeComb.vue
@@ -1,151 +1,49 @@
-
- ![]()
-
-
-
-
-
-
-
-
- {{street||'定位中' }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -160,9 +58,11 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team
// +----------------------------------------------------------------------
-
+
let statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
- import { configMap } from '@/utils';
+ import {
+ configMap
+ } from '@/utils';
export default {
name: 'homeComb',
props: {
@@ -185,9 +85,11 @@
userInfo: {
type: Object,
default: () => {}
- },
+ },
},
- computed: configMap({site_logo: ''}),
+ computed: configMap({
+ site_logo: ''
+ }),
data() {
return {
statusBarHeight: statusBarHeight,
@@ -203,11 +105,11 @@
isLeft: 0, //导航栏下划线位置
isWidth: 0, //每个导航栏占位
mainWidth: 0,
- tabLeft:0,
- swiperIndex:0,
- childIndex:0,
- childID:0,
- tabTitle:this.dataConfig.listConfig.list || [],
+ tabLeft: 0,
+ swiperIndex: 0,
+ childIndex: 0,
+ childID: 0,
+ tabTitle: this.dataConfig.listConfig.list || [],
fixedTop: 0,
isTop: 0,
navHeight: 38,
@@ -226,11 +128,11 @@
isCategory: false,
swiperTop: 0,
isFixed: true,
- street: ''
+ street: ''
};
},
watch: {
- imageH(nVal,oVal){
+ imageH(nVal, oVal) {
this.imageH = nVal
}
},
@@ -238,18 +140,18 @@
var that = this
// 获取设备宽度
uni.getSystemInfo({
- success(e) {
+ success(e) {
that.mainWidth = e.windowWidth
- that.isWidth = (e.windowWidth-65) / 8
+ that.isWidth = (e.windowWidth - 65) / 8
}
- })
+ })
setTimeout((e) => {
const query = uni.createSelectorQuery().in(this);
- if(that.tabTitle.length>0){
+ if (that.tabTitle.length > 0) {
query.select('.navTabBox').boundingClientRect(data => {
that.navHeight = data.height > 42 ? data.height : 42
}).exec();
- }else{
+ } else {
that.navHeight = 0
}
// #ifdef H5
@@ -277,7 +179,7 @@
that.$nextTick(function() {
setTimeout((e) => {
// #ifdef H5
- that.swiperTop = that.navHeight+that.marTop
+ that.swiperTop = that.navHeight + that.marTop
//#endif
// #ifdef MP || APP-PLUS
that.swiperTop = that.navHeight + uni.getSystemInfoSync().statusBarHeight + that.marTop
@@ -285,21 +187,25 @@
}, 500)
})
},
- mounted(){
+ mounted() {
let that = this;
- if(that.tabTitle.length>0 && that.tabTitle[0]['value'] != '推荐'){
+ if (that.tabTitle.length > 0 && that.tabTitle[0]['value'] != '推荐') {
that.tabTitle.unshift({
img: '',
- info: [{value: "推荐"},{value: false}]
+ info: [{
+ value: "推荐"
+ }, {
+ value: false
+ }]
})
- }
+ }
that.$nextTick(function() {
uni.getImageInfo({
src: that.setDomain(that.imgUrls[0].img),
success: function(res) {
- if (res && res.height > 0) {
- let height = res.height * ((750-20) / res.width)
- that.$set(that, 'imageH', height);
+ if (res && res.height > 0) {
+ let height = res.height * ((750 - 20) / res.width)
+ that.$set(that, 'imageH', height);
} else {
that.$set(that, 'imageH', 375);
}
@@ -311,7 +217,7 @@
})
},
methods: {
- goDetail(url){
+ goDetail(url) {
let urls = url.info[1].value
this.$util.JumpPath(urls);
},
@@ -323,14 +229,20 @@
else return url.replace('http://', 'https://');
},
swiperChange(e) {
- let { current, source } = e.detail;
+ let {
+ current,
+ source
+ } = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.swiperCur = e.detail.current;
this.bgColor = this.imgUrls[e.detail.current]['img']
}
},
textChange(e) {
- let { current, source } = e.detail;
+ let {
+ current,
+ source
+ } = e.detail;
if (source === 'autoplay' || source === 'touch') {
this.searchVal = this.hotWords[e.detail.current]['val']
}
@@ -341,12 +253,14 @@
},
/*跳转为页面*/
changeTab(item, index) {
- if(this.tabClick == index) return
+ if (this.tabClick == index) return
this.tabClick = index //设置导航点击了哪一个
this.isLeft = index * this.isWidth + 16 //设置下划线位置
this.tabId = item.info[1].value
this.bgColor = this.tabId ? item.img : this.dataConfig.swiperConfig.list[0]['img']
- this.imgUrls = this.tabId ? [{img:item.img}] : this.dataConfig.swiperConfig.list
+ this.imgUrls = this.tabId ? [{
+ img: item.img
+ }] : this.dataConfig.swiperConfig.list
this.$emit('changeDiy', this.tabId);
}
},
@@ -354,344 +268,419 @@
+
+ /deep/.dot0 .uni-swiper-dots-horizontal {
+ left: 10%;
+ }
+
+ /deep/.dot1 .uni-swiper-dots-horizontal {
+ left: 50%;
+ }
+
+ /deep/.dot2 .uni-swiper-dots-horizontal {
+ left: 90%;
+ }
+
\ No newline at end of file
diff --git a/pages/index/component/homeComb_backup.vue b/pages/index/component/homeComb_backup.vue
new file mode 100644
index 0000000..77eb49a
--- /dev/null
+++ b/pages/index/component/homeComb_backup.vue
@@ -0,0 +1,697 @@
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ {{street||'定位中' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.info[0].value}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index-backup.vue b/pages/index/index-backup.vue
new file mode 100644
index 0000000..d3f61f0
--- /dev/null
+++ b/pages/index/index-backup.vue
@@ -0,0 +1,1731 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ hotTitle }}
+
+
+
+
+
+ {{ loadTitle }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.cate_name }}
+
+
+
+ 更多
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.store_name }}
+
+
+
+ ￥
+ {{ item.price }}
+
+
+
+ {{ item.merchant.type_name }}
+ 自营
+
+ {{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
+
+ 领券
+ 包邮
+
+
+
+
+
+ {{ loadTitle }}
+
+
+
+
+
+
+
+ 暂无商品，去看点什么吧
+
+
+
+
+
+
+ {{beian_sn}}
+
+
+ {{beian_sn}}
+
+
+
+
+
+
+ 网络连接断开
+
+ 请检查情况：
+ · 在设置中是否已开启网络权限
+ · 当前是否处于弱网环境
+ · 版本是否过低，升级试试吧
+
+ 重新连接
+
+
+
+
+
+ 用户协议与隐私政策
+
+ 请务必审慎阅读、充分理解“用户协议 与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个
+ 人信息。你可以在“设置”中查看、变更、 删除个人信息并管理你的授权。
+
+ 你可以阅读
+ 《用户协议》与《隐私政策》
+ 了解 详细信息。如你同意，请点击“我同意”开始接受我们的服务。
+
+
+ 我同意
+ 随便逛逛
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d3f61f0..85f49b4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,67 +1,56 @@
-
-
+ :style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'"
+ id="home">
+
+
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -72,24 +61,30 @@
-
+
-
-
+
+
+
-
+
+
-
+
+
+ @bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed">
+
@@ -101,39 +96,39 @@
-
+
{{ loadTitle }}
-
-
+
+ class="item" v-for="(item, index) in sortList" :key="item.store_category_id">
-
+
{{ item.cate_name }}
-
+
更多
-
+
-
+
-
+
@@ -146,9 +141,12 @@
- {{ item.merchant.type_name }}
- 自营
-
+ {{ item.merchant.type_name }}
+ 自营
+
{{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
领券
@@ -156,12 +154,13 @@
-
+
{{ loadTitle }}
-
+
@@ -173,7 +172,8 @@
- {{beian_sn}}
+ {{beian_sn}}
{{beian_sn}}
@@ -202,7 +202,8 @@
人信息。你可以在“设置”中查看、变更、 删除个人信息并管理你的授权。
你可以阅读
- 《用户协议》与《隐私政策》
+ 《用户协议》与《隐私政策》
了解 详细信息。如你同意，请点击“我同意”开始接受我们的服务。
@@ -225,7 +226,7 @@
+ &.filter {
+ filter: blur(2rpx);
+ }
+
+ .foot-item {
+ display: flex;
+ width: max-content;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ position: relative;
+
+ .count-num {
+ position: absolute;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 40rpx;
+ height: 40rpx;
+ top: 0rpx;
+ right: -15rpx;
+ color: #fff;
+ font-size: 20rpx;
+ background-color: #FD502F;
+ border-radius: 50%;
+ padding: 4rpx;
+ }
+ }
+
+ .foot-item image {
+ height: 50rpx;
+ width: 50rpx;
+ text-align: center;
+ margin: 0 auto;
+ }
+
+ .foot-item .txt {
+ font-size: 24rpx;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 67fed47..9f95d3a 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -1,16 +1,39 @@
-
- 100%正品保证
- 所有商品精挑细选
- 售后无忧
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
-
- 购物数量 {{cartTotalCount}}
- {{ footerswitch ? '管理' : '取消'}}
+
+
+
+
+
+
+
+
+ 购物数量：{{cartTotalCount}}
+ {{ footerswitch ? '管理' : '取消'}}
+
+
+
+
@@ -20,31 +43,38 @@
-
+
{{item.mer_name}}
优惠券
-
+
-
+
+
{{goods.product.store_name}}
-
+
{{goods.productAttr.sku}}
-
- {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件
+
+ {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件
￥{{goods.productAttr.price}}
@@ -54,9 +84,12 @@
- -
+
+ -
{{goods.cart_num}}
- +
+ +
@@ -64,15 +97,19 @@
- 失效商品
+ 失效商品
清空
-
+
失效
-
+
+
{{item.product.store_name}}
@@ -87,13 +124,15 @@
-
+
暂无商品，去添加点什么吧
-
+
-
+
{{loadTitle}}
@@ -123,14 +162,12 @@
-
+
-
+
@@ -148,23 +185,45 @@
// +----------------------------------------------------------------------
import couponListWindow from '@/components/couponListWindow';
import addcartWindow from '@/components/addcartWindow';
- import { getNavigation } from "@/api/public";
+ import {
+ getNavigation
+ } from "@/api/public";
import customTab from '@/components/customTab';
- import { getCartList,getCartCounts,changeCartNum,cartDel,cartProductAttr } from '@/api/order.js';
- import { getCoupons,getShopCoupons } from '@/api/api.js';
- import { getProductHot,collectAll} from '@/api/store.js';
- import { mapGetters } from "vuex";
+ import {
+ getCartList,
+ getCartCounts,
+ changeCartNum,
+ cartDel,
+ cartProductAttr
+ } from '@/api/order.js';
+ import {
+ getCoupons,
+ getShopCoupons
+ } from '@/api/api.js';
+ import {
+ getProductHot,
+ collectAll
+ } from '@/api/store.js';
+ import {
+ mapGetters
+ } from "vuex";
import recommend from '@/components/recommend';
- import { configMap } from '@/utils';
- import { HTTP_REQUEST_URL } from '@/config/app';
- import { toLogin } from '@/libs/login.js';
+ import {
+ configMap
+ } from '@/utils';
+ import {
+ HTTP_REQUEST_URL
+ } from '@/config/app';
+ import {
+ toLogin
+ } from '@/libs/login.js';
const app = getApp();
export default {
props: {
image: {
type: String,
default: '',
- }
+ }
},
components: {
customTab,
@@ -174,11 +233,20 @@
},
data() {
return {
+ tabsArr: [{
+ name: '用户购物车',
+ val: 1
+ }, {
+ name: '商户购物车',
+ val: 2
+ }],
+ tabsCurr: 1,
+ subsecCurr: 0,
domain: HTTP_REQUEST_URL,
loading: false, //是否加载中
loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语
- isFooter:false,
+ isFooter: false,
cartCount: 0,
goodsHidden: true,
footerswitch: true,
@@ -199,7 +267,7 @@
list: [],
},
// 购物车总数
- cartTotalCount:0,
+ cartTotalCount: 0,
recommend: false,
productValue: [], //系统属性
attr: {
@@ -221,11 +289,15 @@
activeRouter: '',
};
},
- computed: configMap({hide_mer_status: 1,recommend_switch:0,navigation: {}}, mapGetters(['isLogin','viewColor'])),
- onReady(){},
+ computed: configMap({
+ hide_mer_status: 1,
+ recommend_switch: 0,
+ navigation: {}
+ }, mapGetters(['isLogin', 'viewColor'])),
+ onReady() {},
mounted: function() {},
onLoad: function(options) {
-
+
},
onShow: function() {
let that = this
@@ -241,17 +313,26 @@
this.isAllSelect = true; //全选
this.selectValue = []; //选中的数据
uni.setStorage({
- key:'invoice_Data',
- data:{},
- success: function(){}
+ key: 'invoice_Data',
+ data: {},
+ success: function() {}
})
- }else{
- setTimeout(() =>{
+ } else {
+ setTimeout(() => {
toLogin()
}, 300);
}
},
methods: {
+ tabsChange(e) {
+ this.tabsCurr = e;
+ },
+
+ subsecChange(e) {
+ console.log(e);
+ this.subsecCurr = e;
+ },
+
goRouter(item) {
var pages = getCurrentPages();
var page = (pages[pages.length - 1]).$page.fullPath;
@@ -274,28 +355,28 @@
} else {
uni.showTabBar()
this.isFooter = false
- }
- })
+ }
+ })
},
// 删除
subDel: function(event) {
let that = this
let type_id = []
- this.cartList.valid.forEach(el=>{
- el.list.forEach(goods=>{
- if(goods.check){
+ this.cartList.valid.forEach(el => {
+ el.list.forEach(goods => {
+ if (goods.check) {
type_id.push(goods.cart_id)
}
})
})
- if(type_id.length == 0){
+ if (type_id.length == 0) {
return that.$util.Tips({
title: '请选择产品'
});
- }else{
+ } else {
cartDel({
- cart_id:type_id,
- }).then(res=>{
+ cart_id: type_id,
+ }).then(res => {
this.getCartList();
this.getCartNum();
return that.$util.Tips({
@@ -313,22 +394,22 @@
subCollect: function(event) {
let that = this
let type_id = []
- this.cartList.valid.forEach(el=>{
- el.list.forEach(goods=>{
- if(goods.check){
+ this.cartList.valid.forEach(el => {
+ el.list.forEach(goods => {
+ if (goods.check) {
type_id.push(goods.spu.spu_id)
}
})
})
- if(type_id.length == 0){
+ if (type_id.length == 0) {
return that.$util.Tips({
title: '请选择产品'
});
- }else{
+ } else {
collectAll({
- type_id:type_id,
- type:1
- }).then(res=>{
+ type_id: type_id,
+ type: 1
+ }).then(res => {
return that.$util.Tips({
title: res.message,
icon: 'success'
@@ -349,10 +430,10 @@
*/
changeCart: function(goods, id) {
let that = this;
- if(that.goods == goods){
+ if (that.goods == goods) {
that.isOpen = that.attr.cartAttr = true;
return
- }else{
+ } else {
// that.goods = JSON.parse((JSON.stringify(goods)));
// that.currSku = goods.productAttr.sku.split(",");
// that.$set(that.attr, 'productAttr', goods.attr);
@@ -367,7 +448,7 @@
// that.isOpen = that.attr.cartAttr = true;
// //打开属性
// that.DefaultSelect(goods)
- cartProductAttr(id).then(res=>{
+ cartProductAttr(id).then(res => {
goods.attr = res.data.attr;
goods.attrValue = res.data.attrValue
that.attrValue = goods.productAttr.sku
@@ -376,19 +457,19 @@
that.currSku = goods.productAttr.sku.split(",");
that.$set(that.attr, 'productAttr', res.data.attr);
const sku = {}
- res.data.attrValue.forEach((itemn)=>{
+ res.data.attrValue.forEach((itemn) => {
sku[itemn.sku] = itemn;
})
- that.$set(that, 'productValue',sku);
- let productSelect = sku[that.attrValue];
- that.isOpen = that.attr.cartAttr = true;
- that.DefaultSelect(goods)
+ that.$set(that, 'productValue', sku);
+ let productSelect = sku[that.attrValue];
+ that.isOpen = that.attr.cartAttr = true;
+ that.DefaultSelect(goods)
}).catch(err => {
return that.$util.Tips({
title: err
});
});
- }
+ }
},
/**
* 默认选中属性
@@ -398,9 +479,9 @@
let productAttr = this.attr.productAttr;
let value = [];
let arr = []
- if(this.currSku){
+ if (this.currSku) {
value = this.currSku
- }else{
+ } else {
for (var key in this.productValue) {
if (this.productValue[key].stock > 0) {
value = this.attr.productAttr.length ? key.split(",") : [];
@@ -418,7 +499,8 @@
"store_name",
goods.product.store_name
);
- this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods.product.image);
+ this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : goods
+ .product.image);
this.$set(this.attr.productSelect, "price", productSelect.price);
this.$set(this.attr.productSelect, "stock", productSelect.stock);
this.$set(this.attr.productSelect, "unique", productSelect.unique);
@@ -479,7 +561,7 @@
}
this.goCart(productSelect);
},
- goCart(productSelect){
+ goCart(productSelect) {
let that = this;
//如果有属性,没有选择,提示用户选择
if (
@@ -497,28 +579,30 @@
}
},
attrVal(val) {
- this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val.indexn]);
+ this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attr_values[val
+ .indexn]);
},
/**
* 属性变动赋值
*
*/
ChangeAttr: function(res) {
- let productSelect = this.productValue[res];
+ let productSelect = this.productValue[res];
this.currSku = 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) {
- this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.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, "stock", productSelect.stock);
this.$set(this.attr.productSelect, "unique", productSelect.unique);
this.$set(this, "uniqueValue", productSelect.unique);
this.$set(this.attr.productSelect, "cart_num", 1);
this.$set(this, "attrValue", res);
- }
- else {
- this.$set(this.attr.productSelect, "image", productSelect.image ? productSelect.image : this.attrImage);
+ } else {
+ 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, "stock", 0);
this.$set(this.attr.productSelect, "unique", "");
@@ -529,9 +613,9 @@
// 立即下单
subOrder: function(event) {
let selectValue = []
- this.cartList.valid.forEach(el=>{
- el.list.forEach(goods=>{
- if(goods.check){
+ this.cartList.valid.forEach(el => {
+ el.list.forEach(goods => {
+ if (goods.check) {
selectValue.push(goods.cart_id)
}
})
@@ -561,7 +645,7 @@
goods.cart_num = Number(goods.cart_num) + 1
that.cartTotalCount = Number(that.cartTotalCount) + 1;
goods.numAdd = false;
- goods.numSub = false;
+ goods.numSub = false;
this.cartAllCheck('goodsCheck')
}).catch(error => {
that.$util.Tips({
@@ -575,7 +659,8 @@
cart_num: that.goods.cart_num,
product_attr_unique: that.newVal.unique
}).then(res => {
- if (that.goods.hasOwnProperty('productAttr') && that.goods.cart_num > that.goods.productAttr.stock) {
+ if (that.goods.hasOwnProperty('productAttr') && that.goods.cart_num > that.goods
+ .productAttr.stock) {
that.goods.cart_num = that.goods.productAttr.stock;
that.goods.numAdd = true;
that.goods.numSub = false;
@@ -609,7 +694,7 @@
}).then(res => {
goods.numSub = false;
goods.numAdd = false;
- if(goods.cart_num <= 1){
+ if (goods.cart_num <= 1) {
goods.numSub = true;
}
goods.cart_num = Number(goods.cart_num) - 1
@@ -651,12 +736,12 @@
})
this.cartList.valid = res.data.list
this.cartList.invalid = res.data.fail
- if(res.data.list.length == 0 && res.data.list.length == 0){
+ if (res.data.list.length == 0 && res.data.list.length == 0) {
this.recommend = true;
- if(!this.hostProduct.length){
+ if (!this.hostProduct.length) {
this.getHostProduct();
}
- }else{
+ } else {
this.recommend = false
}
const sku = {}
@@ -712,7 +797,8 @@
// 总金额 //总数
el.list.forEach(e => {
if (e.check) {
- totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr.price, e.cart_num))
+ totalMoney = this.$util.$h.Add(totalMoney, this.$util.$h.Mul(e.productAttr
+ .price, e.cart_num))
totalNum += e.cart_num
}
})
@@ -758,12 +844,13 @@
},
// 清空
unsetCart: function() {
- let that = this,ids = [];
+ let that = this,
+ ids = [];
for (let i = 0, len = that.cartList.invalid.length; i < len; i++) {
ids.push(that.cartList.invalid[i].cart_id);
}
cartDel({
- cart_id:ids
+ cart_id: ids
}).then(res => {
that.$util.Tips({
title: '清除成功'
@@ -773,13 +860,13 @@
}).catch(res => {});
},
// 店铺优惠券
- giveCoupon(item){
+ giveCoupon(item) {
let that = this;
let goodsArr = []
let couponList = [];
let activeList = [];
let ids = []
- item.list.map(el=>{
+ item.list.map(el => {
ids.push(el.product_id)
})
uni.showLoading({
@@ -787,15 +874,17 @@
mask: true
});
getCoupons({
- ids:ids.join(',')
+ ids: ids.join(',')
}).then(res => {
goodsArr = res.data
- getShopCoupons(item.mer_id).then(({data})=>{
+ getShopCoupons(item.mer_id).then(({
+ data
+ }) => {
uni.hideLoading();
couponList = goodsArr.concat(data)
this.$set(this.coupon, 'list', couponList);
this.$set(this.coupon, 'coupon', true);
- }).catch(error=>{})
+ }).catch(error => {})
});
},
ChangCouponsClose: function() {
@@ -806,7 +895,7 @@
that.coupon.list[index].issue = true;
},
},
- onPullDownRefresh: function(){
+ onPullDownRefresh: function() {
this.cartList = {
valid: [],
invalid: []
@@ -839,19 +928,23 @@
z-index: 5;
top: 0;
}
- .icon-xiala1{
+
+ .icon-xiala1 {
display: inline-block;
transform: rotate(180deg);
font-size: 14rpx;
padding: 0 5rpx;
}
+
.shoppingCart .labelNav .item .iconfont {
font-size: 25rpx;
margin-right: 10rpx;
}
+
.t-color {
- color: var(--view-theme);
+ color: #40AE36;
}
+
.shoppingCart {
/* #ifndef MP */
padding-bottom: 180rpx;
@@ -859,53 +952,107 @@
/* #ifdef MP */
padding-bottom: calc(180rpx+ constant(safe-area-inset-bottom));
padding-bottom: calc(180rpx + env(safe-area-inset-bottom));
+
/* #endif */
+ .shoppingCart-head {
+ background-color: #40AE36;
+
+ .scrollview {
+ display: flex;
+ align-items: center;
+ height: 98rpx;
+ padding-left: 32rpx;
+
+ .scrollview-item {
+ margin-right: 30rpx;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ }
+
+ .scrollview-active {
+ position: relative;
+ font-weight: bold;
+ font-size: 36rpx;
+ color: #FFFFFF;
+
+ &::after {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ bottom: -6rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 100%;
+ height: 6rpx;
+ background-color: #FFFFFF;
+ }
+ }
+ }
+ }
+
+ .func {
+ padding-top: 20rpx;
+ background-color: #fff;
+
+ .subsection {
+ margin: 0 30rpx;
+ }
+
+ .nav {
+ width: 100%;
+ height: 80rpx;
+ background-color: #fff;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ font-size: 28rpx;
+ color: #282828;
+ // position: fixed;
+ left: 0;
+ z-index: 5;
+ top: 76rpx;
+ }
+
+ .shoppingCart .nav .administrate {
+ font-size: 26rpx;
+ color: #282828;
+ width: 110rpx;
+ height: 46rpx;
+ border-radius: 6rpx;
+ border: 1px solid #868686;
+ }
+ }
}
- .shoppingCart .nav {
- width: 100%;
- height: 80rpx;
- background-color: #fff;
- padding: 0 30rpx;
- box-sizing: border-box;
- font-size: 28rpx;
- color: #282828;
- position: fixed;
- left: 0;
- z-index: 5;
- top: 76rpx;
- }
- .shoppingCart .nav .administrate {
- font-size: 26rpx;
- color: #282828;
- width: 110rpx;
- height: 46rpx;
- border-radius: 6rpx;
- border: 1px solid #868686;
- }
+
.shoppingCart .noCart {
margin-top: 20rpx;
margin-bottom: 20rpx;
background-color: #fff;
padding-top: 0.1rpx;
}
+
.shoppingCart .noCart .pictrue {
text-align: center;
margin: 78rpx auto 56rpx auto;
padding-bottom: 60rpx;
}
+
.shoppingCart .noCart .pictrue image {
width: 414rpx;
height: 305rpx;
}
- .shoppingCart .noCart .pictrue view{
+
+ .shoppingCart .noCart .pictrue view {
color: #999;
}
+
.shoppingCart .list {
- margin: 171rpx 0 20rpx;
+ margin: 20rpx 0 20rpx;
}
+
.shoppingCart .list .item {
background-color: #fff;
margin-bottom: 15rpx;
+
.store-title {
display: flex;
align-items: center;
@@ -913,35 +1060,43 @@
padding: 0 30rpx;
height: 85rpx;
border-bottom: 1px solid #f0f0f0;
+
.checkbox {
width: 60rpx;
+
.iconfont {
font-size: 40rpx;
color: #CCCCCC;
}
+
.icon-xuanzhong1 {
- color: var(--view-theme);
+ color: #40AE36;
}
}
+
.info {
flex: 1;
display: flex;
align-items: center;
+
.iconfont {
font-size: 36rpx;
}
+
.name {
margin: 0 0 0 10rpx;
font-size: 28rpx;
color: #282828;
font-weight: bold;
}
+
.icon-xiangyou {
margin-top: 6rpx;
font-size: 22rpx;
color: #999;
}
}
+
.coupon-btn {
color: var(--view-theme);
font-size: 22rpx;
@@ -953,53 +1108,64 @@
}
}
}
+
.vipImg {
width: 65rpx;
height: 28rpx;
margin-left: 10rpx;
+
image {
width: 100%;
height: 100%;
display: block;
}
}
+
.shoppingCart .list .item .picTxt {
width: 100%;
padding: 25rpx 30rpx;
position: relative;
align-items: center;
border-bottom: 1px solid #f0f0f0;
+
.checkbox {
width: 60rpx;
+
.iconfont {
font-size: 40rpx;
color: #CCCCCC;
}
+
.icon-xuanzhong1 {
- color: var(--view-theme);
+ color: #40AE36;
}
}
}
+
.shoppingCart .list .item .picTxt .pictrue {
width: 160rpx;
height: 160rpx;
}
+
.shoppingCart .list .item .picTxt .pictrue image {
width: 100%;
height: 100%;
border-radius: 6rpx;
}
+
.shoppingCart .list .item .picTxt .text {
width: 444rpx;
margin-left: 20rpx;
font-size: 28rpx;
color: #282828;
}
+
.shoppingCart .list .item .picTxt .buy_limit {
margin-top: 10rpx;
color: #E93323;
font-size: 22rpx;
}
+
.shoppingCart .list .item .picTxt .text .infor {
display: inline-block;
padding: 6rpx;
@@ -1010,17 +1176,20 @@
background-color: #F5F5F5;
max-width: 460rpx;
}
+
.shoppingCart .list .item .picTxt .text .money {
font-size: 32rpx;
color: #282828;
margin-top: 28rpx;
}
+
.shoppingCart .list .item .picTxt .carnum {
height: 47rpx;
position: absolute;
bottom: 30rpx;
right: 30rpx;
}
+
.shoppingCart .list .item .picTxt .carnum view {
border: 1px solid #a4a4a4;
min-width: 66rpx;
@@ -1030,25 +1199,31 @@
font-size: 28rpx;
color: #a4a4a4;
}
+
.shoppingCart .list .item .picTxt .carnum .reduce {
border-right: 0;
// border-radius: 3rpx 0 0 3rpx;
}
+
.shoppingCart .list .item .picTxt .carnum .reduce.on,
.shoppingCart .list .item .picTxt .carnum .plus.on {
border-color: #e3e3e3;
color: #dedede;
}
+
.shoppingCart .list .item .picTxt .carnum .plus {
border-left: 0;
// border-radius: 0 3rpx 3rpx 0;
}
+
.shoppingCart .list .item .picTxt .carnum .num {
color: #282828;
}
+
.shoppingCart .invalidGoods {
background-color: #fff;
}
+
.shoppingCart .invalidGoods .goodsNav {
width: 100%;
height: 66rpx;
@@ -1057,25 +1232,30 @@
font-size: 28rpx;
color: #282828;
}
+
.shoppingCart .invalidGoods .goodsNav .iconfont {
color: #424242;
font-size: 28rpx;
margin-right: 17rpx;
}
+
.shoppingCart .invalidGoods .goodsNav .del {
font-size: 26rpx;
color: #999;
}
+
.shoppingCart .invalidGoods .goodsNav .del .icon-shanchu1 {
color: #999;
font-size: 33rpx;
vertical-align: -2rpx;
margin-right: 8rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item {
padding: 20rpx 30rpx;
border-top: 1px solid #f5f5f5;
}
+
.shoppingCart .invalidGoods .goodsList .item .invalid {
font-size: 22rpx;
color: #fff;
@@ -1086,31 +1266,38 @@
text-align: center;
line-height: 36rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item .pictrue {
width: 140rpx;
height: 140rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item .pictrue image {
width: 100%;
height: 100%;
border-radius: 6rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item .text {
width: 433rpx;
font-size: 28rpx;
color: #999;
height: 140rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item .text .name {
width: 100%;
}
+
.shoppingCart .invalidGoods .goodsList .item .text .infor {
font-size: 24rpx;
}
+
.shoppingCart .invalidGoods .goodsList .item .text .end {
font-size: 26rpx;
color: #bbb;
}
+
.shoppingCart .footer {
z-index: 9;
width: 100%;
@@ -1127,6 +1314,7 @@
bottom: 0;
/*#endif*/
}
+
.shoppingCart .footer.on {
/*#ifdef MP || APP-PLUS*/
bottom: 98rpx;
@@ -1134,14 +1322,17 @@
bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
/*#endif*/
}
+
.shoppingCart .footer .checkAll {
font-size: 28rpx;
color: #282828;
margin-left: 16rpx;
}
+
.shoppingCart .footer .money {
font-size: 30rpx;
}
+
.shoppingCart .footer .placeOrder {
color: #fff;
font-size: 30rpx;
@@ -1151,8 +1342,9 @@
text-align: center;
line-height: 70rpx;
margin-left: 22rpx;
- background-color: var(--view-theme);
+ background-color: #40AE36;
}
+
.shoppingCart .footer .button .bnt {
font-size: 28rpx;
color: #999;
@@ -1162,27 +1354,33 @@
height: 60rpx;
text-align: center;
line-height: 60rpx;
+
&.bt-color {
color: var(--view-theme);
border: 1px solid var(--view-theme);
}
}
+
.shoppingCart .footer .button form~form {
margin-left: 17rpx;
}
+
.allcheckbox {
display: flex;
align-items: center;
width: 260rpx;
+
.iconfont {
margin-right: 20rpx;
font-size: 40rpx;
color: #CCCCCC;
}
+
.icon-xuanzhong1 {
- color: var(--view-theme);
+ color: #40AE36;
}
}
+
.page-footer {
position: fixed;
bottom: 0;
@@ -1199,9 +1397,11 @@
box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
- &.filter{
+
+ &.filter {
filter: blur(2rpx);
}
+
.foot-item {
display: flex;
width: max-content;
@@ -1209,6 +1409,7 @@
justify-content: center;
flex-direction: column;
position: relative;
+
.count-num {
position: absolute;
display: flex;
@@ -1225,15 +1426,16 @@
padding: 4rpx;
}
}
+
.foot-item image {
height: 50rpx;
width: 50rpx;
text-align: center;
margin: 0 auto;
}
+
.foot-item .txt {
font-size: 24rpx;
}
}
-
-
+
\ No newline at end of file
diff --git a/pages/order_addcart/order_addcart_backup.vue b/pages/order_addcart/order_addcart_backup.vue
new file mode 100644
index 0000000..67fed47
--- /dev/null
+++ b/pages/order_addcart/order_addcart_backup.vue
@@ -0,0 +1,1239 @@
+
+
+
+
+ 100%正品保证
+ 所有商品精挑细选
+ 售后无忧
+
+
+ 购物数量 {{cartTotalCount}}
+ {{ footerswitch ? '管理' : '取消'}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+
+
+ 优惠券
+
+
+
+
+
+
+
+
+
+
+
+ {{goods.product.store_name}}
+
+ {{goods.productAttr.sku}}
+
+
+
+ {{goods.product.once_min_count}}件起购，最多{{goods.product.once_max_count}}件
+
+
+ ￥{{goods.productAttr.price}}
+
+
+
+
+
+
+ -
+ {{goods.cart_num}}
+ +
+
+
+
+
+
+
+
+ 失效商品
+ 清空
+
+
+
+
+ 失效
+
+
+
+
+ {{item.product.store_name}}
+
+
+
+ 该商品已失效
+
+
+
+
+
+
+
+
+
+
+ 暂无商品，去添加点什么吧
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a77f7ad..17ecf8e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -768,7 +768,7 @@
position: relative;
width: 100%;
padding: 35rpx 0 0rpx;
- background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+ background-image: linear-gradient(to left, #72BE53 0%, #46B03A 100%);
&.svip-card {
padding: 35rpx 0 120rpx;
@@ -1016,7 +1016,7 @@
.iconfont {
font-size: 62rpx;
- color: var(--view-theme);
+ color: #40AE36;
}
}
@@ -1112,7 +1112,7 @@
.order-status-num {
background-color: #fff;
- color: var(--view-theme);
+ color: #40AE36;
border-radius: 200rpx;
position: absolute;
right: -12rpx;
@@ -1125,14 +1125,13 @@
height: 30rpx;
padding: 0 8rpx;
box-sizing: border-box;
- border: 1px solid var(--view-theme);
+ border: 1px solid #40AE36;
}
}
.sys-head {
position: relative;
width: 100%;
- // background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%);
.bg {
position: absolute;
@@ -1140,7 +1139,7 @@
top: 0;
width: 100%;
height: 100%;
- background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+ background-image: linear-gradient(to left, #72BE53 0%, #46B03A 100%);
background-size: 100% auto;
background-position: left bottom;
}
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 08702b2..d7f767e 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1201,13 +1201,13 @@
if (item.valConfig.tabData == 0) {
if (item.name == 'times') {
item.value = dayjs(new Date(Number(new Date()
- .getTime()))).format('HH:mm');
+ .getTime()))).format('HH:mm');
} else if (item.name == 'dates') {
item.value = dayjs(new Date(Number(new Date()
- .getTime()))).format('YYYY-MM-DD');
+ .getTime()))).format('YYYY-MM-DD');
} else {
let current = dayjs(new Date(Number(new Date()
- .getTime()))).format('HH:mm');
+ .getTime()))).format('HH:mm');
item.value = current + ' - ' + current;
}
} else {
@@ -1918,7 +1918,7 @@
}
.t-color {
- color: var(--view-theme);
+ color: #40AE36;
}
.order-submission .address .addressCon .setaddress {
@@ -2032,7 +2032,7 @@
}
.order-submission .virtual_form .item-require {
- color: red;
+ color: #40AE36;
margin-right: 4rpx;
}
@@ -2200,14 +2200,14 @@
}
.order-submission .wrapper .item .list .payItem.on {
- border-color: var(--view-theme);
- color: var(--view-theme);
+ border-color: #40AE36;
+ color: #40AE36;
}
.order-submission .wrapper .item .list .payItem .name {
width: 50%;
text-align: center;
- border-right: 1px solid #eee;
+ border-right: 1px solid #40AE36;
justify-content: left;
padding-left: 80rpx;
}
@@ -2255,7 +2255,7 @@
}
.order-submission .moneyList .item .money {
- color: #868686;
+ color: #40AE36;
display: flex;
align-items: center;
}
@@ -2298,7 +2298,7 @@
}
.pColor {
- color: var(--view-priceColor);
+ color: #40AE36;
}
.order-submission .footer .settlement {
@@ -2306,7 +2306,7 @@
color: #fff;
width: 240rpx;
height: 70rpx;
- background-color: var(--view-theme);
+ background-color: #40AE36;
border-radius: 50rpx;
text-align: center;
line-height: 70rpx;
@@ -2422,7 +2422,7 @@
.price {
margin-top: 20rpx;
- color: var(--view-priceColor);
+ color: #40AE36;
position: relative;
text {
@@ -2567,11 +2567,11 @@
padding-right: 30rpx;
padding-bottom: 30rpx;
font-size: 26rpx;
- color: #282828;
+ color: #40AE36;
.price {
margin-left: 10rpx;
- color: var(--view-priceColor);
+ color: #40AE36;
font-size: 28rpx;
font-weight: bold;
@@ -2630,11 +2630,11 @@
}
.iconfont {
- color: var(--view-theme);
+ color: #40AE36;
}
.map_text {
- color: var(--view-theme);
+ color: #40AE36;
}
}
}
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
new file mode 100644
index 0000000..17141d6
--- /dev/null
+++ b/pages/whole_sale/index.vue
@@ -0,0 +1,317 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 水果蔬菜
+
+
+
+
+
+
+
+
+
+
+
+
+ 水果
+
+
+
+
+
+
+
+
+
+ 价格
+
+
+
+ 销量
+
+
+ 抵扣
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/1-001.png b/static/images/1-001.png
index 3c9ac39..b9ca607 100644
Binary files a/static/images/1-001.png and b/static/images/1-001.png differ
diff --git a/static/images/1-002.png b/static/images/1-002.png
index f05682b..ad1bb96 100644
Binary files a/static/images/1-002.png and b/static/images/1-002.png differ
diff --git a/static/images/2-001.png b/static/images/2-001.png
index 4a4ce02..bc6ca91 100644
Binary files a/static/images/2-001.png and b/static/images/2-001.png differ
diff --git a/static/images/2-002.png b/static/images/2-002.png
index 5069750..ae39093 100644
Binary files a/static/images/2-002.png and b/static/images/2-002.png differ
diff --git a/static/images/3-001.png b/static/images/3-001.png
index 8637fed..2c7ac27 100644
Binary files a/static/images/3-001.png and b/static/images/3-001.png differ
diff --git a/static/images/3-002.png b/static/images/3-002.png
index 5aa6e9c..c6bff0d 100644
Binary files a/static/images/3-002.png and b/static/images/3-002.png differ
diff --git a/static/images/4-001.png b/static/images/4-001.png
index 5fb279c..0292c1b 100644
Binary files a/static/images/4-001.png and b/static/images/4-001.png differ
diff --git a/static/images/4-002.png b/static/images/4-002.png
index e79368c..d20175e 100644
Binary files a/static/images/4-002.png and b/static/images/4-002.png differ
diff --git a/static/images/5-001.png b/static/images/5-001.png
index 12dbfe7..72e2bf4 100644
Binary files a/static/images/5-001.png and b/static/images/5-001.png differ
diff --git a/static/images/5-002.png b/static/images/5-002.png
index ffd4e51..7cbac51 100644
Binary files a/static/images/5-002.png and b/static/images/5-002.png differ
diff --git a/static/images/组 21508@2x.png b/static/images/组 21508@2x.png
new file mode 100644
index 0000000..ad1bb96
Binary files /dev/null and b/static/images/组 21508@2x.png differ
diff --git a/static/new_define/loudou.png b/static/new_define/loudou.png
new file mode 100644
index 0000000..fdf1b85
Binary files /dev/null and b/static/new_define/loudou.png differ
diff --git a/static/new_define/priceChange.png b/static/new_define/priceChange.png
new file mode 100644
index 0000000..f80f03b
Binary files /dev/null and b/static/new_define/priceChange.png differ