From 856e037e6cc41902fc53a31dc82f291cd21532ef Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 11 Mar 2024 18:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/WaterfallsFlow/WaterfallsFlow.vue | 374 +--
components/recommend/index.vue | 210 +-
pages.json | 43 +-
pages/gather/gather.vue | 329 +-
pages/gather/gather_backup.vue | 565 ++++
pages/index/component/homeComb.vue | 949 +++---
pages/index/component/homeComb_backup.vue | 697 ++++
pages/index/index-backup.vue | 1731 ++++++++++
pages/index/index.vue | 2992 +++++++++---------
pages/order_addcart/order_addcart.vue | 472 ++-
pages/order_addcart/order_addcart_backup.vue | 1239 ++++++++
pages/user/index.vue | 11 +-
pages/users/order_confirm/index.vue | 32 +-
pages/whole_sale/index.vue | 317 ++
static/images/1-001.png | Bin 2329 -> 1116 bytes
static/images/1-002.png | Bin 3289 -> 3654 bytes
static/images/2-001.png | Bin 1598 -> 1100 bytes
static/images/2-002.png | Bin 3597 -> 6383 bytes
static/images/3-001.png | Bin 1690 -> 1593 bytes
static/images/3-002.png | Bin 3588 -> 4908 bytes
static/images/4-001.png | Bin 2057 -> 1257 bytes
static/images/4-002.png | Bin 3068 -> 3677 bytes
static/images/5-001.png | Bin 4279 -> 1287 bytes
static/images/5-002.png | Bin 3376 -> 6176 bytes
static/images/组 21508@2x.png | Bin 0 -> 3654 bytes
static/new_define/loudou.png | Bin 0 -> 427 bytes
static/new_define/priceChange.png | Bin 0 -> 329 bytes
27 files changed, 7613 insertions(+), 2348 deletions(-)
create mode 100644 pages/gather/gather_backup.vue
create mode 100644 pages/index/component/homeComb_backup.vue
create mode 100644 pages/index/index-backup.vue
create mode 100644 pages/order_addcart/order_addcart_backup.vue
create mode 100644 pages/whole_sale/index.vue
create mode 100644 static/images/组 21508@2x.png
create mode 100644 static/new_define/loudou.png
create mode 100644 static/new_define/priceChange.png
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 3c9ac3924000e4b399c1488a263a1d5302e743dc..b9ca607de76c2b48830dd775a52bb8122df5bc5c 100644
GIT binary patch
literal 1116
zcmV-i1f%Px(7D+@wRCr$Pnn7CIFc3yH*^y1TLAe2Nf`(nBP2mKE6BJGWoS^gs&=V9kQg);#
zXmSI%0c`A@r=C{M=LlPtZOJ%|y(GrcyqS^y841{yKd|NYvjM;m0b5RBNP#U6fcISl
zg%AfxlI)L0qn9K}mb2OHscVP4OA1UTlii)2ol5{X&l&u}7`u>C-gOC~a{y%gcszb&
zj2)C1dMBkk>k2}r0H)LF-e@%XX)!*tyE6!#0ib+mjFIPe4evf9;w}Ju$p0M?=W!gL
z%;$4TjbKkF04&BoL{W4)9*_6PU=spkY!OA#QAh~E0ZgaUi4OZU&m-awrPOKWTAd#E
zjIn*g-9aG)1t5eV18>dvHI2`H*9+vl00O1Kk(6@bI~RfhC^Mchb}gm6DltQc6vH8|U)96aZGdcWA3c
zoB(Lj-7&2Fr+}kH9+?e-)yPrS>Up6Ic@5I
zUatWq_X5nl`6@Ny+C>CueX=HmdJTYc{z#3|D&t)D@QngcC8td&RaIP0muyA^6qKrT
zFJRTS0)V~rAoXJog!K$@69Lfq|LVZg^sw1+a#fcbvj}p|tpJ*es{w#f4)=B!7$RUu
zf&XX?(5FMxCeO;@r#OxeZ8A1Q3YhaqFHTTzlD1Rlr%^dvq`;g<)GwObpt%dw{hogR
zA#H@L-BGCePGbO^^BVy8S~Wn~?;!wCH%KW(ZE@$PF#yZCoYUaG0o17<@)K+fASXrX
z4iAN0VaGUR1kf!Mx=orM+0j**TAt75)f#}4yL11j{1ayMA$Ab(J&|~Lx
iGPNNBI>FrILH+;|tS4?#i6qtl0000i_q}ix+b%D=R;UCCr#YOixcAg6FLQULTk6!lL7yrCgJa
z9zD7(5;LZsuk3wRs2x>_jheXyI-Ai$S346KGL{@q_5R9h
z9#-k11`#ir2E1G|!>DR!dHytpiI+wk($dmyZ_}pDW@O%I;ql9fGc7+qzb@hoLj)*?
zn3%?|D0UQEd}ZHlB9oBWd3(GWvrmKAPTF77m&$IH}$g{5}-QW|mXt
zRk4UX5${Vu37LJ|Vo`m!1MqQr-_u@|j5Hm3PDRE$Ts8|r8GhJ(gfu@$B4Je{l%(kVTC~0b5Q3
z`93GL$q__t!v7;edz%j)x^@^&c|
zlM;(~h~UQXXvC$BpM>Wv#>NhM`LaIA+!y^(J-v3Wn$+z
z>|AT&C<|$(WKeDxY#~xg2T7S}ka`UObDG-NXy!+an}9cdX5fuAbTmDv)+defw}dED
zITFc)J}ltk`ze{IEbm7Xk`vj0%mt(@t?6wx^+rpG2>c#_cj^V6J9jRk)rX=oe0$7M7>n9={f8H@fTzVNbd9qH(K7Opi3wKc^L%A;dT%-
zfV)WF-+*?iimk+cfhao;q%8{z0+JhZsM<@6+)>*TDJK$)07~0B%+`$^MDPVf&70)3
zRG2r0*eBI}HBj@2Q=uK-6>vEg43v1G$oB=lWjDWyFaa-ItwNBmAd0g3UfLrB
zr2u^gvB4u5s_eF?+JUcD-%i~v$o^6g6Jf)sUTP2OO-YZ(nendNOH}XUZ@F#{|gY;=l
zU*03+J!x-r33lQErblk=6!X(_rj+l~PRse1{{s+r0I|`IVJnEQ08xJiB_D`={RG3S
zuGB=?9h|L$xC)42TTA4*)vmB7DG6!3LrbC_u-5|eFR#k^B^@IHoCS!
zma&H5kw=>wgh=$EGr5NJvYpuIl$D&WGCb^Ldjtd5UJkHH2Fm@(+TZAwvh}!U&z?Qn
zwQIM<%MzO{#6Erc+<-UA=TJJDl=4hUNIqHR+n{|lK%6D4H*PSL=nWmb0ou^
zZ!IVtBcplr=Ii;=#~HuS1m0L2M8?Cnnd!{)DYS*ltZZ@wQ3Oz}CzF|_Fzqufax~yniGd`1yR6I1!V3lUph+g
zJ17(V<;x`UHK#_$@yzUX4N7EY6s7l||4OgBFd~8&N{qR7cY5c(^wM(TNo=RViHDzK!00000NkvXXu0mjfsccHO
diff --git a/static/images/1-002.png b/static/images/1-002.png
index f05682b6dc657817dcf710255734b6dc70b60a14..ad1bb96f82b790ab552569d6666d674a2e7e412b 100644
GIT binary patch
literal 3654
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
Y2k=?H*DTX?e*gdg07*qoM6N<$f`rw^Q~&?~
literal 3289
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
X5v+egK>PPI00000NkvXXu0mjfFg97_
diff --git a/static/images/2-001.png b/static/images/2-001.png
index 4a4ce02510e5951890f0be0ac08e3df001755232..bc6ca91e3a74ef120d163389be7c14040ec43680 100644
GIT binary patch
literal 1100
zcmV-S1he~zP)Px(21!IgRCr$PT03hMK@>h`HCF_|Cc5#f{&c@jW+RJ2*?0nc@boGc6N9Qy>uF$v{v*=~X$@fc!nd
zR9HRV37P`^n_WnOkOK2RmxUS-YQXQ0C8n2^v2yBLbWDMn+WF!M1eh}2)Z3SBygK`!
zfbbX$k3p|*l%WXL6`At5Z_%-hS7+~wCn%tf;h=yL1HO{8CA`kw7f(omI)*D!;0FLK
zD}MJq9JP(F+m{bViD*^`G1oL<;@esQNs@d*#C3&ppXLY?fD74_kH?AVvk+pvjb9f6
z=JoUdz%9;s+a_pJw&i2B^0Apo92Wx4BjQEfc`sB@)gnVg7laU(Ocq|)SQC(c6Hpys
z`gz@qlybjIlavkE!Zu(0!%{cuH0OM-vBK1^69I7??~0=6X*mcHsngs}mSrz}x<;zN
zt24rZfdO?=+(yJdQcg;_J5AGPrVIB{K(2zj0C2=M;6Jjz$vHpa;@e39MWDsdE$Y)H
zs@CB}fO3$hgF3HY>v9J?=6vaPjURN8y<>fWjGL?4SbFZFW$d9h(4Pz+-V$Q!^rZ
z-))|l=(gqG*PA4K;xtBp4~SmQ4FvR({lySFC}1(%gP)9n(jO%_I#h8km;_j{&jWrqbjsk(i2Re6)YhMSV<5g
z7(s%VAVwe%K}52|1Tg}E2qM&$xU;j9q21>Z+AfQ@JUu^FgTm?d|Q?kkN*&9sEy&ZhLaH
zH$a&I2JlBnn<9u%ir^iFG^D88N2lH@%0CpvK)=B+JqI{WY<_ol_rC4`dLaVfApm}?
z)2V8L{*BK#S9e_NLPH&$jl6k+XGp)cbD+x$gR1f7oRLbV)_zPQo1OB&T3LjlxUmxdrK615BayB+Lj!}jdB-@ii&Yn-s
zB12pOM5}&)-nVt!SYHSAXa4&>aSzT#
zu5l2t*wF@=Hq+IIwkBkuwI9bq`USGPoZu!x{A2Nj&P7N=6(EPzMUEC3>=d3Y1w`^)
zSXIATItw)#dM<}QpX%;=ipO|<3zMvXJ-lrfF)VWqleD7@RxgaFN^6G2S>{9%pK)&
z-QswxF~=GAKzkkL0q8vuE%J0`&%`ExMz<{!SNp~yk71EVJ|Ag(EUorETUm3-yX&)V
zHAD)s-`w2n`>xD=9Vp(Lj?m4_BWI4^o!46q|5b?2@k1Y$`K@Z1#`4~Hg8P&$!QR}I
z`{#@H+4f~c{SzrDPq`|*adF8edYaKbs35-N^;u#DVG~#Jk>L5nNaN032#OXqr74Vm
zU1_+KIw8q`a9N`dM6LG{D=Z5(@e#`52~D)R#1!sm7bY)6QkILZ)gt7n1c2YLv86;L
z^+OjKs84Ax)>twp&@3Q_bz?Llhz2B0n_h&`w)TZOLh=ES;=r{ZvrrX*d0RkhEZek4
zNdp7KmIomVr5Iw-t5OC*tQ0%i+YPl-NJ`mk&Z&5Y^X~{7>Ji!-#cWRvQL6m^R4ze`
zFxm;?JRp|ypChzC77>z1y$Jeu441+O9}r_~wTj4u-T0jb3j@l-~ff-Hgv
zh3Q1lm9`#O&YQEnX!>{|a*?<|P|oVE6ALb7XMTc$vd)NNqt4D;THQ1Uv?QB7%ljbq
zAf%eXIuo63);K3C9QPOcyys3+K8Po%|0wqb!hYdCu^naJ>d{COsnw2q4
zXALc;Y=W2|x$tP-NdGd)GTFECSpUC}T
zkK_|AvtyYqWhZjB(YYLbuI3=lYPS&YTc*><*~Z_+p|3tvv&<%xW@0SSbI7IoNMkHL
z6im@RKnRKUWvIU}IopklJGEq4CDL|U6Fv_P6
z&Cus8@DeX5E37ZEa`PP)^4U|<2kFU&lCNTjAr>7o`G8UXo?=K2^)&QBU+IhJw4D+?
wYKS7K|5>2~F~Wc+hzVi@0ue+cON;>VFV!U%odPh06#xJL07*qoM6N<$f{ZWkJOBUy
diff --git a/static/images/2-002.png b/static/images/2-002.png
index 50697509156137d72206c8ece664777373cb9de7..ae390932e73ff11258746328aae69d268342af39 100644
GIT binary patch
literal 6383
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
literal 3597
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
T5f3^e00000NkvXXu0mjfmG2nu
diff --git a/static/images/3-001.png b/static/images/3-001.png
index 8637fed2a4c50cdf539f4471865c486df3822617..2c7ac27c6e029245e9beb97225297cd2436a413a 100644
GIT binary patch
literal 1593
zcmV-92FCe`P)Px)^GQTORCr$PT3c@0I20w7$M2*on9K?$S-~_bXl4a<0E@_9(iPNML6g5g3{ZCk
zO;^y&3YxB<&I%^^l@YN#0cFrMCEY8@MGf0OMG=X*JUsW@%R@@B=0CaS^A{TcHVjyE
z1U4zK<^Sa_$EmbjCo*;
z*^^S<8Dk!|wzj@pUtdqUjE#3YrGQfEtsP_}gxIeM1VN6nEc-+ab}$(1?e6ZL*@>P@
zDfg=0GsXani<_I9JL=fsbFBby0e%!h98*7RjJcmqr$^)Q__6LCut^B`*
z?hijGfS|QL37qPe*PA&yfNm%=Kn2nzbJ}F=z$&MSW5X%WU}wFEW6}@z+ym}
zrUNM@sPF&2CrNS~6C^jOaTu(f)QQ%5><^-p!vCQuv!5~MYC4^cVrerR4qsa^ZiNtY
z04GWE7e^df09euc5eVM*EXx{G!BQJ5h$>Oi^-*j6s{FsJBHsdF8&?wmgK+@}pRz0)
zP+33*AQmJQZ6}(j2L5XOYr(?`iZo3xrIcqLK>um2kwT5Xkd-KrKDbQ-kO5Fiq1?Uq
z24o=}ndFt$`rH9<7o^DyoTdr5_tAI!Sw347#SyhMk^zWJU?Gp|f>lbPWI{m8G?=Zj
zQp))6=6U|Asa)3SM@(a?V&ecXw@Mt8@o^_wUnv0Cnof=j<3-qck!2Ye+xR1YC{$?<
z%D(`BxeCIGjRQa@4OlV*=Bg8ion!#QD&RIGht!(8EC51n5kfrKW~g%i5at9KfSB51
zGorOVYD}~xX@G0Xe+1nlt2%K3h;@Rud7hs%sdnECaQlXj;hu!ro0N;j0>CLQIbGV9UhD$|f3>WTEwG9SLaWKQVnEP=p_N5>oZFERf`7{Me81F<
zP#*~Im)+!pF=jw*dt>9WQy?}7N|DRk#+@NNgV+|=mDzJ^Y}DCnFQ0e5;B8mGu`>gx
zEA=}+*9!xF=Lt5&))@dt-M6sAoefs|O;}>an0H~`rfGU+ODHs@HU&^}kw&n|`mn}Z
z1K{kg_py51ggX9i&kPRB99BwU;vXpQMf#6RyM4ZDYQ(C>ZUsOW_tpz!R=Ofq8w-mj
zx4CXGHUK?M9t^1L1X;6p54Qz@1wh5-<7F~vbMrjEtD<6GdjXevXq8944d&8{yg6&t
z2}Yb3jMM1e;-S6(C14ky9XI
zYCcS-(*vsdE(?H|UC%L9IRMOAVw}}qMhf^s8M1(r24n!j(;XoM%e!9|0{}#5*;93i
zr2%Q0uDvZDy22#&_r$91U$Y)j3xwYspAoC0CH$}vO%Lge&!c6br8i{tCZdK16R
zZfdH?0JxJ_`0ukHRcvBP-LMy!L!Ffa147)u0WrOdUTaD>lem!P2hQp(Tat&bRUVqGTsdm#i4Vdrj|m6xc{
z4hIyUv)Y>I&j!Hdawvx7cW^BZl>+~kS7c&Tj2f7AMk|1T4JL$uSmKHdfL%EKp{Aq{
z3|Rw$#$(|+3k7Wi1Hh`TTwif-7|<7z
rt2)kx0js)leZ{?DKwn6%>Nr0EgRUxlQuG&(00000NkvXXu0mjfEnnRv
literal 1690
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
KMNUMnLSTZ-DBXYn
diff --git a/static/images/4-001.png b/static/images/4-001.png
index 5fb279c7d58bf1af10681df46ce6515079c07452..0292c1b55d1bbdb9848f6c7c1f378bca70e31836 100644
GIT binary patch
literal 1257
zcmV=P)Px(qe(2x~hM@L7a{{cHI06`G!1Hjv98$`sj
z1c>K%9SAD`LWmJ#%zFAdD2R9wMbY|TFu1s@Y{&!Plri?SL(LdiRle|_EKZPJEhcX
zuXa|_n7ROv&wpa<-@hZ`Po>nul52YPT3rA(k|6nA+es{?>`?kd#FuHDXnmuI_=7Qa
zDy2NgGo}^*^syiaQ2%Hg$B#JY!`63gF@S)GqG-#OuA2bx8vyQ)*P}qlIX?w}d!B;u
zK`BLs)+1ccrf7KSSBHR`riB`!R5C9CNlsAQ469dga7>41hFLi+sA|vM!
z(QOP!GrNhk1Qdwh
zYu~ccpMGx&fVq$tm7x&gdm?~zf6qObMgaI22yM|nkN%ArU{i!`2f`}!cLjh~fv^hw
zT>)SQ!UHKK^%QUYvC+SXk&R+N>H?WSh={EzLLr3Nrzo_gF#w6+$dtxyw#b4YAnCiN
z$@Aw*DPm~u(-?r11=JOuRDsi??yUU668tX1FkCBArcMA5LYy(ip6JK}00l>CoAp|1
zkd)FSP5>|mDWtp8P3tOgR)=r2>>)szs=`@1~g?;p;H$ycbT@P>7vC36-g8j5%HwXD4oO>V~ms~6<-7@1v#4g
zoissrCIC<@SXx^8YV_rFJ1c2~X?K?Bu2K|5+eJms%+sJj|4ea|v-oy0sGu}C^$CK2
zrcIvygCnAoEaVJo@S7=&2>kP$D
zGM6mJmlL|(E=BLpdUK>I1JX>g6-Cj=5@h{gK-n0OFylPw*G>9&d9fln=}fyV@4ZC-
z`w;`kKuc+Cv)fq~&|RZyCUEWoWI(C|XgodX6Y7TLjjE@xVA|c~VHk#+Ug?1GMp7j>
zxiUj#Dk2^>P=b3}n{7znDr$QdF=8eRC|cB~-xmP*bQ*2gvS2_PsQa|$+%w=WkNaF-
TO||ml00000NkvXXu0mjfdk8v|
literal 2057
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
KMNUMnLSTZp!{6or
diff --git a/static/images/5-001.png b/static/images/5-001.png
index 12dbfe793028c2f19e9d9a6db40469c1af960c9b..72e2bf452819d8196ad3480a5924ee51b9017fae 100644
GIT binary patch
literal 1287
zcmV+i1^D`jP)