From 380d683c792c21dbfd76ded7fa98b3bace3b1b4a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 08 十月 2024 16:37:07 +0800
Subject: [PATCH] update 包大小
---
App.vue | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 498 insertions(+), 15 deletions(-)
diff --git a/App.vue b/App.vue
index d028cdd..95bb58e 100644
--- a/App.vue
+++ b/App.vue
@@ -5,7 +5,45 @@
import storage from '@/plugins/storage.js'
export default {
- onLaunch: function(options) {
+ onLaunch: async function(options) {
+ //清除一些缓存
+ this.$storage.removeItem('cache_home_show_coupon')
+ // #ifdef PUB_PARTNER
+ // this.$storage.removeItem('cache_partner_info')
+ // #endif
+
+ var query = options.q && decodeURIComponent(options.q) || ''
+ var querydto = {}
+ if (query) {
+ try {
+ var keyvalues = query.split("?")[1].split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ } catch (e) {
+ console.error('error', e)
+ }
+ }
+ try {
+ if (!querydto.partnerUserId) {
+ if (options.query && options.query.scene || options.scene) {
+ //说明是特殊小程序二维码扫码跳转的
+ var keyvalues = decodeURIComponent(options.query && options.query.scene || options.scene)
+ .split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ }
+ }
+
+ } catch (e) {
+ console.error('error2', e)
+ }
+
+ console.log('app query222', options, query, '\n@@\n ', querydto)
+
console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
console.log('App Launch')
@@ -22,13 +60,20 @@
});
// #ifdef MP
if (true && storage.getItem('token')) {
+ const res = await this.$store.dispatch('getCurrentInfo');
setTimeout(async () => {
- const res = await this.$store.dispatch('getCurrentInfo');
// #ifndef PUB_CUSTOMER
if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
- uni.reLaunch({
- url: '/pages/home/supplier-home'
- })
+ if (this.currentInfo.type === 'admin') {
+ uni.reLaunch({
+ url: '/sub_pages/partner/delivery/delivery-home'
+ })
+ } else {
+ uni.reLaunch({
+ url: '/pages/home/supplier-home'
+ })
+ }
+
} else {
uni.reLaunch({
url: '/pages/login/supplier-login'
@@ -45,9 +90,19 @@
}
// #endif
// #ifdef PUB_CUSTOMER
- uni.reLaunch({
- url: '/pages/home/home'
- })
+ // 需要处理一下，判断是跳转登录还是原封不动
+ if (!!querydto.partnerUserId) {
+ //需要去注册页面
+ console.log('options', options)
+ //说明走的是特殊微信小程序，那么就要专门处理了
+
+
+ } else {
+ // uni.reLaunch({
+ // url: '/pages/home/home'
+ // })
+ }
+
// #endif
},
@@ -234,12 +289,19 @@
padding-top: 40rpx;
padding-bottom: 40rpx;
font-size: var(--title_font_size2);
+ color: #20613D;
+ font-weight: 600;
}
.title-before-blue:before {
- content: "|";
- color: #3140A2;
+ content: "||";
+
margin-right: 20rpx;
+ color: #20613D;
+ margin-right: 20rpx;
+ min-width: 20rpx;
+ background-color: #20613D;
+ border-radius: 6rpx;
}
.blue {
@@ -387,6 +449,10 @@
.m-t-15 {
margin-top: 30rpx;
+ }
+
+ .p-t-12 {
+ padding-top: 30rpx;
}
.m-t-icon {
@@ -760,7 +826,6 @@
.msg-tip {
font-size: 24rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 34rpx;
@@ -878,7 +943,6 @@
border-radius: 62rpx;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 80rpx;
@@ -895,7 +959,6 @@
border-radius: 62rpx;
border: 2rpx solid #666666;
font-size: 32rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 92rpx;
@@ -906,7 +969,6 @@
.close-parent {
position: relative;
font-size: 28rpx;
- font-family: PingFangSC, PingFang SC;
font-weight: 600;
color: #000000;
line-height: 40rpx;
@@ -1085,7 +1147,7 @@
margin-right: 20rpx;
border: 2rpx solid #FFFFFF;
background-size: 100% 100%;
- background-color: #fff;
+ background-color: #fff;
}
.store-name {
@@ -1095,6 +1157,7 @@
line-height: 40rpx;
margin-top: 20rpx;
}
+
.store-name.t1 {
color: #666;
}
@@ -1106,6 +1169,7 @@
line-height: 34rpx;
margin-top: 8rpx;
}
+
.store-address.t1 {
color: #666;
}
@@ -1120,6 +1184,7 @@
color: #5B8C71;
line-height: 52rpx;
text-align: center;
+ margin-top: 30rpx;
}
.store-sc {
@@ -1132,6 +1197,7 @@
color: #FFFFFF;
line-height: 64rpx;
display: flex;
+ margin-top: 20rpx;
.icon-view {
// margin-top: 8rpx;
@@ -1240,4 +1306,421 @@
background-color: #20613D;
}
}
+</style>
+
+<style lang="scss">
+
+.component-tab-container{
+ display: flex;
+ width: fit-content;
+ margin:0 auto;
+ .tab-item{
+ display: flex;
+ text-align: center;
+ border-radius: 8rpx;
+ border: 2rpx solid var(--topicolor);
+ background: #fff;
+ color: var(--topicolor);
+ width: 212rpx;
+ line-height: 64rpx;
+ font-weight: 600;
+ font-size: 28rpx;
+ display: block;
+ }
+ .tab-item.cur{
+ background: var(--topicolor);
+ // border-radius: 0rpx 8rpx 8rpx 0rpx;
+ color: #fff;
+ }
+ .tab-item:first-child{
+ border-top-right-radius: 0rpx;
+ border-bottom-right-radius: 0rpx;
+ }
+ .tab-item:last-child{
+ border-top-left-radius: 0rpx;
+ border-bottom-left-radius: 0rpx;
+ }
+}
+.component-button-upload{
+ width: 96rpx;
+ height: 96rpx;
+ border-radius: 4rpx;
+ border: 2rpx dashed #CECECE;
+ position: relative;
+ background-image: 100% 100%;
+ &::after{
+ content: "+";
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%,-50%);
+ // width: 22rpx;
+ // height: 22rpx;
+ font-size: 24rpx;
+ color: #696969;
+ }
+}
+.component-price-old{
+ text-decoration: line-through;
+ color: #9a9da2 !important;
+ font-size: 22rpx !important;
+}
+.component-price-new{
+ position: relative;
+ .tip{
+ font-size: 22rpx;
+ display: inline-block;
+ margin-right: 10rpx;
+ }
+ .p{
+ font-size: 40rpx;
+ font-weight: 600;
+ }
+ .component-price-old{
+ position: absolute;
+ // left: 0rpx;
+ top: 40rpx;
+ right: 0rpx;
+ color: #9a9da2 !important;
+ }
+}
+.component-line-vert{
+ width: 2rpx;
+ background-color: #EEEEEE;
+}
+.component-popup_input.white{
+ background: #fff;
+
+}
+.component-bg{
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ top: 0;
+ width: 100%;
+ height: 100;
+ height: 100%;
+ z-index: -1;
+ background-size: 100% 100%;
+}
+.component-popup_input_all{
+ margin: 0 auto;
+ margin-top: 160rpx;
+ height: calc(100vh - 300rpx);
+ overflow-y: scroll;
+ background-color: #fff;
+ border-radius: 40rpx 40rpx 0rpx 0rpx;
+ padding: 26rpx;
+ position: relative;
+ .button-space{
+ // border: 2rpx solid #EEEEEE;
+ min-height: 160rpx;
+ }
+ .value-items{
+
+
+ .value-item{
+ min-width: 152rpx;
+ width: fit-content;
+ text-align: center;
+ height: 58rpx;
+ background: #F1F5F2;
+ border-radius: 36rpx;
+ margin-bottom: 18rpx;
+ font-weight: 400;
+ font-size: 28rpx;
+ line-height: 58rpx;
+ padding: 8rpx 24rpx;
+ color: #33a868;
+ margin-left: 6rpx;
+ margin-right: 6rpx;
+ border: 2rpx solid #F1F5F2;
+ }
+ .value-item.cur{
+ background: #E1F0E7;
+ border-radius: 36rpx;
+ border: 2rpx solid #20613D;
+ color: #20613D;
+
+ }
+ }
+
+ .button-green{
+ border-top: 2rpx solid #EEEEEE;
+ position: fixed;
+ bottom: 80rpx;
+ left: 26rpx;
+ right: 26rpx;
+ height: 78rpx;
+ background: #20613D;
+ border-radius: 40rpx;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ line-height: 78rpx;
+ }
+ .button-green.button-white{
+ background: #F1F5F2;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #20613D;
+ line-height: 78rpx;
+ }
+}
+.component-button-contact{
+ background: none;
+ border: none;
+ box-sizing: 0px;
+ outline: none;
+ border-inline: none;
+ // margin-top: 0px;
+ display: flex;
+ margin-left: 0rpx;
+ margin-right: auto;
+ font-size: 30rpx;
+ flex: 1;
+ padding-left: 0rpx;
+ padding-right: 0rpx;
+ line-height: 40rpx;
+}
+.component-buttons{
+ display: flex;
+ margin-left: auto;
+ width: fit-content;
+
+ .button {
+ // width: 216rpx;
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+
+ }
+
+ .button-1 {
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+ background: #fff;
+ color: #333;
+ border: 2rpx solid #333;
+
+ }
+
+ .button-0 {
+ padding: 10rpx 20rpx;
+ line-height: 34rpx;
+ font-size: 24rpx;
+ height: 34rpx;
+ background: #20613D;
+ text-align: center;
+ border-radius: 30rpx;
+ min-width: 80rpx;
+ color: #fff;
+ border: 2rpx solid #20613D;
+ }
+}
+.component-button-contact::after{
+ display: none !important;
+}
+.component-stock-zero::after{
+ position: absolute;
+ line-height: 100%;
+ // font-size: ;
+ left: -2rpx;
+ right: -2rpx;
+ top: -2rpx;
+ bottom: -2rpx;
+ font-size: 600;
+ content: '已售罄';
+ color: #fff;
+ text-align: center;
+ padding-top: calc(50% - 20rpx);
+ background-color: #52525275;
+}
+.component-stock-zero{
+ position: relative;
+}
+.component-status-zero{
+ position: relative;
+
+}
+.component-status-zero::after{
+ position: absolute;
+ line-height: 100%;
+ // font-size: ;
+ left: -2rpx;
+ right: -2rpx;
+ top: -2rpx;
+ bottom: -2rpx;
+ font-size: 600;
+ content: '已下架';
+ color: #fff;
+ text-align: center;
+ padding-top: calc(50% - 20rpx);
+ background-color: #52525275;
+}
+.component-status-zero{
+ position: relative;
+}
+.component-popup_input{
+ margin: 0 auto;
+ margin-top: 160rpx;
+
+ // margin-left: 78rpx - 26rpx;
+ width: 594rpx;
+
+ background: linear-gradient(180deg, #D8F0EE 0%, #FFFFFF 100%);
+ border-radius: 16rpx;
+ padding: 26rpx;
+ position: relative;
+ .title{
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #333333;
+ line-height: 42rpx;
+ text-align: center;
+ margin-bottom: 32rpx;
+ }
+ .uni-easyinput{
+ width: auto !important;
+ }
+ .icon{
+ z-index: -1;
+ position: absolute;
+ width: 266rpx;
+ height: 146rpx;
+ top: -134rpx;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ .close-parent{
+ margin-bottom: 34rpx;
+ }
+ .button-green{
+ margin-top: 50rpx;
+ }
+}
+
+
+.component-filter-container {
+ display: flex;
+ .flex1 {
+ text-align: center;
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #000000;
+ line-height: 34rpx;
+ }
+}
+
+.component-shop-item {
+ margin-top: 20rpx;
+ background: #FFFFFF;
+ border-radius: 8rpx;
+ padding: 10rpx;
+
+ .info-container {
+ position: relative;
+
+ .other-info {
+ margin-top: 6rpx;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ text-align: left;
+ }
+
+ .shop-name {
+ margin-top: 14rpx;
+ font-size: 24rpx;
+ color: #666666;
+ line-height: 34rpx;
+ }
+
+ .bottom-buttons {
+ // width: 400rpx;
+ position: absolute;
+ bottom: 0rpx;
+
+ left: 0;
+ right: 0;
+
+ .icons {
+ margin-left: auto;
+ margin-right: 0rpx;
+ margin-top: -10rpx;
+
+ .curnums {
+ line-height: 60rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
+ }
+ }
+ }
+
+ .title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #000000;
+ line-height: 44rpx;
+ margin-top: 8rpx;
+ position: relative;
+
+ .price {
+ position: absolute;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #CF0000;
+ line-height: 40rpx;
+ top: 0;
+ right: 0;
+ }
+ }
+
+ }
+
+ .img {
+ width: 206rpx;
+ height: 206rpx;
+ border-radius: 8rpx;
+ position: relative;
+
+ .level {
+ position: absolute;
+ width: 66rpx;
+ height: 44rpx;
+ background: #20613D;
+ left: 0;
+ top: 0;
+ border-top-left-radius: 8rpx;
+ border-bottom-right-radius: 8rpx;
+ color: #FFFFFF;
+ line-height: 44rpx;
+ font-size: 24rpx;
+ text-align: center;
+ }
+
+ }
+
+
+}
+
+
+.u-steps-item{
+ /deep/ .u-text__value{
+ font-size: 28rpx !important;
+ }
+}
+
</style>
\ No newline at end of file
--
Gitblit v1.9.3