Px$*-1n}R9Hvt*1JvuQ4|HxeFs6XATdTwjD@wau<#48v@s_BgBF+}(5Q4uY``(0
zA@~gzL<$QZg{7_f19ng%kBH`&F;0Sn$9)#WOG#!fD|^oD1H*)U*o1ju!KR;>P1q*f
zmw+7!I}-nDB;54zBV#PuMrW&(&(~BQzv~{YvygKQ;L0nUy1Zuzy>zKe_6dXy5MJ6&
zCn1aWu?RW0444C`>sLv
zR>k_iFEkQC3NmONSZT0m(z>upU|zINtTK2US~pe;co;hR8CeRdOQsEmwT9G7H|Vh5
z7ZG5u1X}caRwq_l!oBSgqu2vLtH0k>n~mCzNY9SzV{HlhKlFEl{dA_(av6oz2JXXF
z8L*QSe
Date: Wed, 13 Aug 2025 11:30:43 +0800
Subject: [PATCH 2/4] no message
---
pages/contract/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index eba769c..e2e48d1 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -3,7 +3,7 @@
-
@@ -34,7 +34,7 @@ export default {
},
methods: {
init(){
- this.isSignContract()
+ // this.isSignContract()
this.getSignContract()
},
isSignContract(){
From d9ef37ba2295c92a1dc6db0ae516904f93b4b815 Mon Sep 17 00:00:00 2001
From: "LAPTOP-V1CF3RCA\\31532" <315328220@qq.com>
Date: Wed, 13 Aug 2025 11:32:04 +0800
Subject: [PATCH 3/4] no message
---
pages/contract/index.vue | 55 ----------------------------------------
1 file changed, 55 deletions(-)
diff --git a/pages/contract/index.vue b/pages/contract/index.vue
index e2e48d1..24b9e29 100644
--- a/pages/contract/index.vue
+++ b/pages/contract/index.vue
@@ -72,61 +72,6 @@ export default {
//去签署
}
- },
- // 查询用户等级
- async getUserInfo() {
- const result = await getUserInfo();
- if (result && result.bizcode === 100) {
- const data = result.data;
- this.userData = result.data || {};
- }
- },
- // 退出登录
- loginOutFun() {
- clear();
- uni.navigateTo({
- url: '/pages/login_package/login/login'
- })
- },
- cancelAccount() {
- clear();
- uni.navigateTo({
- url: '/pages/login_package/login/login'
- })
- },
- jumpInfo(type) {
- // 地址
- if (type === "address") {
- uni.navigateTo({
- url: '/pages/mine_package/mine_address/mine_address'
- })
- } else if (type === "aboutUs") {
- uni.navigateTo({
- url: '/pages/mine_package/mine_about_us/mine_about_us'
- })
- } else if (type === "userAgreement") {// 用户协议
- uni.navigateTo({
- url: '/pages/mine_package/mine_user_agreement/mine_user_agreement'
- })
- } else if (type === "privacyAgreement") {// 隐私政策
- uni.navigateTo({
- url: '/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement'
- })
- } else if (type === "productAgreement") {// 售后保障协议
- uni.navigateTo({
- url: '/pages/mine_package/mine_product_agreement/mine_product_agreement'
- })
- }else if(type === 'contract'){
- uni.navigateTo({
- url:'/pages/contract/index'
- })
- }
- },
- // 跳转到交易密码
- jumpPwd() {
- uni.navigateTo({
- url: '/pages/mine_package/mine_transaction_password/mine_transaction_password'
- })
}
}
}
From 92cacfdf46926c01301123f4fb622521a837c2ac Mon Sep 17 00:00:00 2001
From: "LAPTOP-V1CF3RCA\\31532" <315328220@qq.com>
Date: Wed, 13 Aug 2025 16:18:54 +0800
Subject: [PATCH 4/4] no message
---
App.vue | 21 +++
pages.json | 7 +-
pages/home/home.vue | 2 +-
pages/other_package/search/search.vue | 6 +-
pages/shop/components/shop-item.vue | 66 ++++++++
pages/shop/search.vue | 231 ++++++++++++++++++++++++++
pages/sort/sort.vue | 7 +-
7 files changed, 330 insertions(+), 10 deletions(-)
create mode 100644 pages/shop/components/shop-item.vue
create mode 100644 pages/shop/search.vue
diff --git a/App.vue b/App.vue
index 7dbcdf0..97a42d8 100644
--- a/App.vue
+++ b/App.vue
@@ -107,6 +107,27 @@
.text-36{
font-size:36rpx;
}
+.text-bold{
+ font-weight:bold;
+}
+.line-h{
+ line-height:1.2
+}
+.mr-32{
+ margin-right:32rpx;
+}
+.text-overflow1 {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical;
+}
+.text-d{
+ text-decoration: line-through;
+}
+
button {
margin-bottom: 15px;
}
diff --git a/pages.json b/pages.json
index 1e152c2..319b911 100644
--- a/pages.json
+++ b/pages.json
@@ -46,7 +46,12 @@
"navigationStyle": "custom"
}
},
-
+ {
+ "path": "pages/shop/search",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/LuckyWheel/LuckyWheel",
"style": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index dc62bfa..9b778f1 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -424,7 +424,7 @@ export default {
},
jumpSearch() {
uni.navigateTo({
- url: '/pages/other_package/search/search',
+ url: '/pages/shop/search',
})
},
/**
diff --git a/pages/other_package/search/search.vue b/pages/other_package/search/search.vue
index 3d920fc..db8bb8a 100644
--- a/pages/other_package/search/search.vue
+++ b/pages/other_package/search/search.vue
@@ -25,7 +25,7 @@