From 069a5993b203ff470c8e739da72863eaf83c5990 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 20 Feb 2024 16:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/Authorize.vue | 3 +-
components/productWindow/index.vue | 2 +-
libs/login.js | 5 +-
manifest.json | 4 +-
pages/activity/presell/index.vue | 7 +-
pages/activity/presell_details/index.vue | 49 +++++-
pages/index/index.vue | 9 +-
pages/newActivity/giftBag/giftBag.vue | 193 +++++++++++------------
pages/users/login/login_copy.vue | 10 +-
pages/users/order_confirm/index.vue | 11 +-
pages/users/user_info/index.vue | 2 +-
11 files changed, 167 insertions(+), 128 deletions(-)
diff --git a/components/Authorize.vue b/components/Authorize.vue
index cfb0ef7..dd9b10f 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -101,7 +101,8 @@
title: '用户登录',
info: '请登录，将为您提供更好的服务！',
//#ifdef H5
- isWeixin: this.$wechat.isWeixin(),
+ // isWeixin: this.$wechat.isWeixin(),
+ isWeixin: false, // 关闭微信公众号授权登录
//#endif
//#ifdef MP
title: '授权提醒',
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index 121f55c..167cfbf 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -11,7 +11,7 @@
- 预售价
+
￥{{ attr.productSelect.price }}
定金￥{{ attr.productSelect.down_price }}
diff --git a/libs/login.js b/libs/login.js
index 99ef69c..542ab40 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -51,7 +51,10 @@ export function toLogin(push, pathLogin) {
Cache.set('login_back_url', path);
// #ifdef H5
if (isWeixin()) {
- auth.oAuth();
+ // auth.oAuth();
+ uni.navigateTo({
+ url: '/pages/users/login/login_copy',
+ })
} else {
if (path !== pathLogin) {
push ? uni.navigateTo({
diff --git a/manifest.json b/manifest.json
index feecf5f..e927935 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农生活",
"appid" : "__UNI__3A527D1",
"description" : "",
- "versionName" : "1.8.7",
- "versionCode" : 187,
+ "versionName" : "1.8.8",
+ "versionCode" : 188,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/activity/presell/index.vue b/pages/activity/presell/index.vue
index dd4c33b..54268e4 100644
--- a/pages/activity/presell/index.vue
+++ b/pages/activity/presell/index.vue
@@ -167,7 +167,7 @@ import { Toast } from '../../../libs/uniApi.js';
that.getPresellProductList();
},
goDetails(item) {
- if(!item.type) return this.$refs.tipspopupRef.open(); // type表示该活动是否能点击
+ // if(!item.type) return this.$refs.tipspopupRef.open(); // type表示该活动是否能点击
uni.navigateTo({
url: '/pages/activity/presell_details/index?id=' + item.product_presell_id
})
@@ -423,7 +423,10 @@ import { Toast } from '../../../libs/uniApi.js';
font-size: 24rpx;
color: #616161;
width: 240rpx;
- height: 96rpx;
+ // height: 96rpx;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 3; /* 指定显示三行 */
overflow: hidden;
text-overflow: ellipsis;
}
diff --git a/pages/activity/presell_details/index.vue b/pages/activity/presell_details/index.vue
index f79f205..4fe988f 100644
--- a/pages/activity/presell_details/index.vue
+++ b/pages/activity/presell_details/index.vue
@@ -26,7 +26,7 @@
￥
{{presellInfo.price}}
- 预售价
+
@@ -34,14 +34,15 @@
- 市场价:￥{{storeInfo.price || ''}}
- 已预定:{{presellInfo.seles}}{{ storeInfo.unit_name }}
+
+ 单位: {{ storeInfo.unit_name }}
{{storeInfo.merchant.type_name}}
自营
{{presellInfo.store_name}}
-
+
预售活动时间：
@@ -72,6 +73,9 @@
预售结束后{{ presellInfo.delivery_day }}天内发货
+
+
+
优惠券：
@@ -207,7 +211,25 @@
产品介绍
-
+
+
+
+
+
+
+
+
+
+ {{description.content.title}}
+
+
+
+
+
+
@@ -1275,6 +1297,7 @@
*
*/
downloadFilePromotionCode: function(successFn) {
+ return ;
let that = this;
let type;
// #ifndef MP
@@ -2336,4 +2359,20 @@
}
}
}
+ .product_content{
+ background-color: #fff;
+ &_title{
+ width: 100%;
+ height: auto;
+ line-height: 50rpx;
+ padding: 28rpx;
+ word-wrap: break-word;
+ text-align: center;
+ }
+ image{
+ width: 750rpx;
+ // height: auto;
+ // height: 750rpx;
+ }
+ }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ce43d30..8bddd87 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -159,7 +159,8 @@
-
+
+
@@ -384,7 +384,7 @@
// #endif
goCopyUrl() {
// #ifdef H5
- location.href = 'http://' + this.copyright.url
+ // location.href = 'http://' + this.copyright.url
// #endif
},
userAgree() {
@@ -1290,14 +1290,14 @@
}
.copyright {
- position: fixed;
+ position: absolute;
bottom: 30rpx;
left: 0;
width: 100%;
text-align: center;
font-size: 20rpx;
line-height: 28rpx;
- color: #FFFFFF;
+ color: #ccc;
.cell {
// margin-left: 6rpx;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index bc5d10d..1abea4f 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -36,18 +36,19 @@
-
+
- 预售{{goods.productPresell.store_name}}
+
+
+ {{goods.productPresell.store_name}}
{{goods.productAttr.sku}}
-
+
￥{{goods.productPresellAttr.presell_price}}
X{{goods.cart_num}}
- 发货时间：
+ 发货时间：
{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 8553b09..20c8b0d 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -135,7 +135,7 @@
- 退出登录
+ 退出登录
退出登录