From d48c75fad4cc174cc9846392cd5bc8398003719e Mon Sep 17 00:00:00 2001
From: anhaogxs <704041637@qq.com>
Date: Fri, 23 Apr 2021 09:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/index.js | 2 +-
pages/Loading/index.vue | 4 +-
pages/shop/GoodsList/index.vue | 209 ++++++---------------------------
3 files changed, 38 insertions(+), 177 deletions(-)
diff --git a/config/index.js b/config/index.js
index 728afb9..34018a4 100644
--- a/config/index.js
+++ b/config/index.js
@@ -5,4 +5,4 @@ export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
// export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api'
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
-export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'
+export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 91060de..207912f 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -1,7 +1,7 @@
-
+
@@ -61,11 +61,11 @@ export default {
console.log('loading home')
this.changeAuthorization(false)
let redirect = cookie.get('redirect').replace(/\ /g, '')
+ cookie.remove('redirect')
if (redirect && redirect.indexOf('/pages') != -1) {
this.$yrouter.replace({
path: '/pages' + redirect.split('/pages')[1],
})
- cookie.remove('redirect')
} else {
this.$yrouter.switchTab({
path: '/pages/home/index',
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index d36d4f6..e902c4e 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -26,90 +26,41 @@
新品
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
-
-
- ￥{{ item.price }}
- ￥{{ item.otPrice }}
-
- 已售{{ item.sales }}件
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
-
-
- ￥{{ item.price }}
- ￥{{ item.otPrice }}
-
- 已售{{ item.sales }}件
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
-
-
- {{ item.integral }}积分
-
- 已售{{ item.sales }}件
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.storeName }}
-
-
- {{ item.integral }}积分
-
- 已售{{ item.sales }}件
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ item.storeName }}
+
+ ￥
+ {{ item.price }}
+
+
+ ￥{{ item.otPrice }}
+ 已售{{ item.sales }}件
+
+
+
+
+
+
+
+
+
+
+ {{ item.storeName }}
+
+ {{ item.integral }}积分
+
+
+
+ 已售{{ item.sales }}件
+
+
+
+
@@ -358,94 +309,4 @@ export default {
border-top: 3px solid #f5f5f5;
padding-bottom: 1px;
}
-
-.tui-product-list {
- display: flex;
- box-sizing: border-box;
- margin-top: 1.72*100rpx;
-}
-
-.tui-product-container {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- flex:1;
- justify-content: space-between;
-
-}
-
-.tui-product-container:last-child {
- margin-right: 0;
-}
-
-.tui-pro-item {
- flex: 0 0 49%;
- margin-bottom: 10rpx;
- background: #fff;
- box-sizing: border-box;
- border-radius: 12rpx;
- overflow: hidden;
- transition: all 0.15s ease-in-out;
-}
-
-.tui-flex-list {
- flex:1 1 100%;
- display: flex;
- margin-bottom: 1rpx !important;
-}
-
-.tui-pro-img {
- width: 100%;
- display: block;
-}
-
-.tui-proimg-list {
- width: 260rpx;
- height: 260rpx !important;
- flex-shrink: 0;
- border-radius: 12rpx;
-}
-
-.tui-pro-content {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- box-sizing: border-box;
- padding: 20rpx;
-}
-
-.tui-pro-tit {
- color: #2e2e2e;
- font-size: 26rpx;
- word-break: break-all;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
-}
-
-.tui-pro-price {
- padding-top: 18rpx;
-}
-
-.tui-sale-price {
- font-size: 34rpx;
- font-weight: 500;
- color: #e41f19;
-}
-
-.tui-factory-price {
- font-size: 24rpx;
- color: #a0a0a0;
- text-decoration: line-through;
- padding-left: 12rpx;
-}
-
-.tui-pro-pay {
- padding-top: 10rpx;
- font-size: 24rpx;
- color: #656565;
-}
-/* 商品列表*/