소스 검색

分享隐藏返回&&活动页面&&实名认证修改

viczhq 3 주 전
부모
커밋
d563bdfe5e

+ 14 - 0
project.private.config.json

@@ -10,6 +10,20 @@
10 10
     "miniprogram": {
11 11
       "list": [
12 12
         {
13
+          "name": "pages/indexSub/activity/index",
14
+          "pathName": "pages/indexSub/activity/index",
15
+          "query": "",
16
+          "launchMode": "default",
17
+          "scene": null
18
+        },
19
+        {
20
+          "name": "pages/indexSub/seckillIndex/index",
21
+          "pathName": "pages/indexSub/seckillIndex/index",
22
+          "query": "id=124&title=%E8%82%AF%E9%BA%A6%E5%BF%85%E6%BD%AE%E8%B6%B4&isBanner=true",
23
+          "launchMode": "default",
24
+          "scene": null
25
+        },
26
+        {
13 27
           "name": "pages/indexSub/productDetail/index",
14 28
           "pathName": "pages/indexSub/productDetail/index",
15 29
           "query": "id=21268&isSeckill=false&shareUserId=&tagTitle=&isShare=false",

+ 2 - 1
src/app.config.js

@@ -13,7 +13,8 @@ export default defineAppConfig({
13 13
         "productDetail/index",
14 14
         "seckillIndex/index",
15 15
         "searchList/index",
16
-        "highCommission/index"
16
+        "highCommission/index",
17
+        "activity/index"
17 18
       ]
18 19
     },
19 20
     {

+ 2 - 2
src/components/ProductCard/index.jsx

@@ -2,9 +2,9 @@ import { View, Text, Image } from '@tarojs/components'
2 2
 import Taro from '@tarojs/taro'
3 3
 import './index.less'
4 4
 
5
-const ProductCard = ({ product,isShare }) => {
5
+const ProductCard = ({ product,isShare,isShowBack }) => {
6 6
   return (
7
-    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}&isShare=${isShare}` })} className='product-card'>
7
+    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}&isShare=${isShare}&isShowBack=${isShowBack}` })} className='product-card'>
8 8
       <Image className='product-img' src={product.image_url} mode='aspectFill' />
9 9
       <View className='product-content'>
10 10
         <Text className='title'>{product.item_title}</Text>

+ 3 - 1
src/components/index/ProductList/index.jsx

@@ -36,6 +36,7 @@ const ProductList = forwardRef((props, ref) => {
36 36
     shareUserId, // 分享用户id
37 37
     isEmpty, // 是否为空
38 38
     isShare, //是否是分享
39
+    isShowBack, //是否显示返回
39 40
   } = props;
40 41
 
41 42
   const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
@@ -71,7 +72,7 @@ const ProductList = forwardRef((props, ref) => {
71 72
       selectProduct(id);
72 73
     } else {
73 74
       Taro.navigateTo({
74
-        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}&&isShare=${isShare}`,
75
+        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}&&isShare=${isShare}&&isShowBack=${isShowBack}`,
75 76
       });
76 77
     }
77 78
   };
@@ -339,6 +340,7 @@ ProductList.defaultProps = {
339 340
   shareUserId: "",
340 341
   isEmpty: false, // 是否为空
341 342
   isShare: false, //分享
343
+  isShowBack: false, //是否显示返回
342 344
   onAddProduct: () => {}, // 添加商品方法
343 345
   onDeleteProductSelect: () => {}, // 删除商品选中id数组
344 346
 };

+ 25 - 0
src/pages/index/index.jsx

@@ -30,6 +30,8 @@ export default class Index extends Component {
30 30
     page: 1, // 添加页码
31 31
     totalPages: 1, // 添加总页数
32 32
     loading: false, // 添加加载状态
33
+    params: {}, // 添加参数
34
+    userInfo: {}, // 添加用户信息
33 35
   };
34 36
   // 获取首页数据
35 37
   getHomeData = async () => {
@@ -80,6 +82,13 @@ export default class Index extends Component {
80 82
     );
81 83
   }
82 84
   componentDidShow() {
85
+    const params = Taro.getCurrentInstance().router.params;
86
+    const userInfo = Taro.getStorageSync("userInfo");
87
+    this.setState({
88
+      params: params,
89
+      userInfo: userInfo,
90
+    });
91
+    console.log(params, "params");
83 92
     this.setState(
84 93
       {
85 94
         page: 1,
@@ -215,6 +224,22 @@ export default class Index extends Component {
215 224
             onShareProduct={this.handleShare}
216 225
           />
217 226
         </View>
227
+        {/* 打印参数 */}
228
+        {Object.keys(this.state.params).length > 0 &&
229
+          (this.state.userInfo.id === 2818 ||
230
+            this.state.userInfo.id === 2815 ||
231
+            this.state.userInfo.id === 2820) && (
232
+            <View className="params-wrap" style={{ width: "70%" }}>
233
+              <View style={{ 
234
+                wordBreak: "break-all", 
235
+                whiteSpace: "pre-wrap",
236
+                fontSize: "12px",
237
+                padding: "10px"
238
+              }}>
239
+                {JSON.stringify(this.state.params, null, 2)}
240
+              </View>
241
+            </View>
242
+          )}
218 243
         {/* 添加浮动按钮 */}
219 244
         <View className="float-buttons">
220 245
           <View

+ 4 - 0
src/pages/indexSub/activity/index.config.js

@@ -0,0 +1,4 @@
1
+export default definePageConfig({
2
+  navigationBarTitleText: '',
3
+  navigationStyle: 'custom',
4
+})

+ 258 - 0
src/pages/indexSub/activity/index.jsx

@@ -0,0 +1,258 @@
1
+import { Component } from "react";
2
+import { View, Image, Text, ScrollView } from "@tarojs/components";
3
+import { AtTabs, AtActivityIndicator } from "taro-ui";
4
+import "./index.less";
5
+import Taro from "@tarojs/taro";
6
+export default class Index extends Component {
7
+  state = {
8
+    current: 0,
9
+    page: 1, //页数
10
+    loading: false, //加载状态
11
+    totalPages: 1, // 添加总页数
12
+    isNoMore: false, // 是否没有更多
13
+    productList: [], //商品列表
14
+    tags: [
15
+      { title: "全部" },
16
+      { title: "限时秒杀" },
17
+      { title: "限时秒杀" },
18
+      { title: "限时秒杀" },
19
+      { title: "限时秒杀" },
20
+      { title: "限时秒杀" },
21
+      { title: "限时秒杀" },
22
+    ],
23
+    productList: [
24
+      {
25
+        id: 1,
26
+        name: "新款时尚连衣裙2024春新款时尚连衣裙2024春新款时尚连衣裙2024春",
27
+        price: "29.00",
28
+        commission: "29.9",
29
+        image: "https://yushi.tos-cn-beijing.volces.com/products/product1.png",
30
+      },
31
+      {
32
+        id: 2,
33
+        name: "轻奢真皮小方包",
34
+        price: "458.00",
35
+        commission: "45.8",
36
+        image: "https://yushi.tos-cn-beijing.volces.com/products/product2.png",
37
+      },
38
+      {
39
+        id: 3,
40
+        name: "高端蚕丝围巾披肩",
41
+        price: "199.00",
42
+        commission: "19.9",
43
+        image: "https://yushi.tos-cn-beijing.volces.com/products/product3.png",
44
+      },
45
+      {
46
+        id: 4,
47
+        name: "925纯银项链女",
48
+        price: "328.00",
49
+        commission: "32.8",
50
+        image: "https://yushi.tos-cn-beijing.volces.com/products/product4.png",
51
+      },
52
+      {
53
+        id: 5,
54
+        name: "小众设计感衬衫",
55
+        price: "268.00",
56
+        commission: "26.8",
57
+        image: "https://yushi.tos-cn-beijing.volces.com/products/product5.png",
58
+      },
59
+    ],
60
+  };
61
+  componentDidMount() {}
62
+  // 获取商品列表
63
+  getBrowseShopProductList = async (isRefresh = false) => {
64
+    const { page } = this.state;
65
+    this.setState({ loading: true });
66
+
67
+    const res = await getBrowseShopProductList({
68
+      tag_name: this.state.tabList[this.state.current].title,
69
+      page,
70
+      page_size: 10,
71
+    });
72
+
73
+    this.setState((prevState) => ({
74
+      productList: isRefresh
75
+        ? res.goods_list
76
+        : [...prevState.productList, ...res.goods_list],
77
+      totalPages: res.total_pages,
78
+      loading: false,
79
+    }));
80
+  };
81
+  // 返回
82
+  handleBack = () => {
83
+    Taro.navigateBack();
84
+  };
85
+  // 切换tab
86
+  tabClick = (index) => {
87
+    this.setState({
88
+      current: index,
89
+      // page: 1,
90
+      // productList: [],
91
+      // isNoMore: false,
92
+      // isLoading: false,
93
+    });
94
+    // this.getBrowseShopProductList(true);
95
+  };
96
+  // 滚动到底部
97
+  handleScrollToLower = () => {
98
+    console.log("滚动到底部");
99
+    return;
100
+    const { page, totalPages, loading } = this.state;
101
+    if (page < totalPages && !loading) {
102
+      this.setState(
103
+        (prevState) => ({ page: prevState.page + 1 }),
104
+        () => this.getBrowseShopProductList()
105
+      );
106
+    }
107
+  };
108
+  render() {
109
+    return (
110
+      <View className="index">
111
+        {/* 返回按钮 */}
112
+        <Image
113
+          onClick={this.handleBack}
114
+          style={{ top: Taro.navigationBarHeight + "px" }}
115
+          className="top-back"
116
+          src="https://yushi.tos-cn-beijing.volces.com/activity/back.png"
117
+          mode="widthFix"
118
+        />
119
+        {/* 顶部图片包裹盒子 */}
120
+        <View className="top-img-wrap">
121
+          <Image
122
+            className="top-img"
123
+            src="https://yushi.tos-cn-beijing.volces.com/activity/topImg.png"
124
+            mode="widthFix"
125
+          />
126
+          <Image
127
+            className="top-title-img"
128
+            src="https://yushi.tos-cn-beijing.volces.com/activity/titleImgOne.png"
129
+            mode="widthFix"
130
+          />
131
+        </View>
132
+        {/* 专场 */}
133
+        <View className="activity-wrap">
134
+          <View className="topBox">
135
+            <View className="item">
136
+              <View className="item-title">下午茶专场</View>
137
+              <Image
138
+                className="item-img"
139
+                src="https://yushi.tos-cn-beijing.volces.com/activity/topOne.png"
140
+                mode="widthFix"
141
+              />
142
+              <View className="item-text">点击进入</View>
143
+            </View>
144
+            <View className="item">
145
+              <View className="item-title">餐饮美食专场</View>
146
+              <Image
147
+                className="item-img"
148
+                src="https://yushi.tos-cn-beijing.volces.com/activity/topTwo.png"
149
+                mode="widthFix"
150
+              />
151
+              <View className="item-text">点击进入</View>
152
+            </View>
153
+          </View>
154
+          <View className="centerBox">
155
+            <View className="item">
156
+              <View className="item-title">酒店出行专场</View>
157
+              <Image
158
+                className="item-img"
159
+                src="https://yushi.tos-cn-beijing.volces.com/activity/centerOne.png"
160
+                mode="widthFix"
161
+              />
162
+              <View className="item-text">点击进入</View>
163
+            </View>
164
+            <View className="item">
165
+              <View className="item-title">清洗服务专场</View>
166
+              <Image
167
+                className="item-img"
168
+                src="https://yushi.tos-cn-beijing.volces.com/activity/centerTwo.png"
169
+                mode="widthFix"
170
+              />
171
+              <View className="item-text">点击进入</View>
172
+            </View>
173
+            <View className="item">
174
+              <View className="item-title">游玩娱乐专场</View>
175
+              <Image
176
+                className="item-img"
177
+                src="https://yushi.tos-cn-beijing.volces.com/activity/centerThree.png"
178
+                mode="widthFix"
179
+              />
180
+              <View className="item-text">点击进入</View>
181
+            </View>
182
+          </View>
183
+          <View className="bottomBox">
184
+            <View className="item">
185
+              <View className="item-title">咖啡专场</View>
186
+              <Image
187
+                className="item-img"
188
+                src="https://yushi.tos-cn-beijing.volces.com/activity/bottom.png"
189
+                mode="widthFix"
190
+              />
191
+              <View className="item-text">点击进入</View>
192
+            </View>
193
+          </View>
194
+        </View>
195
+        <Image
196
+          className="bottom-title-img"
197
+          src="https://yushi.tos-cn-beijing.volces.com/activity/titleImgOne.png"
198
+          mode="widthFix"
199
+        />
200
+        {/* 商品列表盒子 */}
201
+        <View className="product-list-wrap">
202
+          {/* tab分类 */}
203
+          <View className="tabs-list">
204
+            <AtTabs
205
+              current={this.state.current}
206
+              scroll
207
+              tabList={this.state.tags}
208
+              onClick={this.tabClick}
209
+            />
210
+          </View>
211
+          <ScrollView
212
+            onScrollToLower={this.handleScrollToLower}
213
+            className="product-list"
214
+            scrollY
215
+          >
216
+            <View className="product-list-container">
217
+              {this.state.productList.map((product) => (
218
+                <View key={product.id} className="product-list-item">
219
+                  <Image
220
+                    className="product-img"
221
+                    src={product.image}
222
+                    mode="aspectFill"
223
+                  />
224
+                  <View className="product-content">
225
+                    <Text className="product-title">{product.name}</Text>
226
+                    <View className="product-price">
227
+                      <View className="product-price-left">
228
+                        <Text className="product-price-text">到手价</Text>
229
+                        <Text className="product-price-text-price">
230
+                          ¥{product.price}
231
+                        </Text>
232
+                      </View>
233
+                      <View className="product-commission">
234
+                        <Text className="product-commission-text">
235
+                          赚¥{product.commission}
236
+                        </Text>
237
+                      </View>
238
+                    </View>
239
+                  </View>
240
+                </View>
241
+              ))}
242
+              {this.state.loading && (
243
+                <View className="loading">
244
+                  <AtActivityIndicator
245
+                    content="加载中..."
246
+                    isOpened={this.state.loading}
247
+                    mode="center"
248
+                    color="#fff"
249
+                  />
250
+                </View>
251
+              )}
252
+            </View>
253
+          </ScrollView>
254
+        </View>
255
+      </View>
256
+    );
257
+  }
258
+}

+ 288 - 0
src/pages/indexSub/activity/index.less

@@ -0,0 +1,288 @@
1
+.index {
2
+    width: 100%;
3
+    min-height: 100vh;
4
+    background: linear-gradient(90deg, #FE5F3B 0%, #F51C1C 52%, #FE5F3B 99%);
5
+    padding-bottom: 33px;
6
+
7
+    .top-back {
8
+        position: fixed;
9
+        left: 22px;
10
+        width: 64px;
11
+        height: 64px;
12
+        z-index: 1000;
13
+    }
14
+
15
+    // 顶部图片包裹盒子
16
+    .top-img-wrap {
17
+        position: relative;
18
+
19
+        .top-img {
20
+            width: 100%;
21
+        }
22
+
23
+        .top-title-img {
24
+            position: absolute;
25
+            bottom: 0;
26
+            left: 50%;
27
+            transform: translateX(-50%);
28
+            width: 542px;
29
+            height: 105px;
30
+        }
31
+    }
32
+
33
+    // 专场盒子
34
+    .activity-wrap {
35
+        margin: 0 13px;
36
+        width: 724px;
37
+        height: 1007px;
38
+        background: url('https://yushi.tos-cn-beijing.volces.com/activity/activeWrap.png') no-repeat center center;
39
+        background-size: 100% 100%;
40
+        padding: 44px 30px 0 36px;
41
+        box-sizing: border-box;
42
+
43
+        .topBox,
44
+        .centerBox,
45
+        .bottomBox {
46
+            display: flex;
47
+            justify-content: space-between;
48
+            align-items: center;
49
+
50
+            .item {
51
+                position: relative;
52
+                width: 320px;
53
+                height: 276px;
54
+
55
+                .item-title {
56
+                    font-weight: 700;
57
+                    font-size: 24px;
58
+                    color: #FF4A00;
59
+                    position: absolute;
60
+                    top: 24px;
61
+                    left: 50%;
62
+                    transform: translateX(-50%);
63
+                    white-space: nowrap;
64
+                }
65
+
66
+                .item-img {
67
+                    width: 100%;
68
+                }
69
+
70
+                .item-text {
71
+                    position: absolute;
72
+                    font-size: 20px;
73
+                    color: #FFFFFF;
74
+                    line-height: 29px;
75
+                    bottom: 11px;
76
+                    left: 50%;
77
+                    transform: translateX(-50%);
78
+                }
79
+            }
80
+        }
81
+
82
+        .centerBox {
83
+            margin-top: 20px;
84
+
85
+            .item {
86
+                width: 206px;
87
+                height: 298px;
88
+            }
89
+
90
+            .item-text {
91
+                bottom: 10px !important;
92
+            }
93
+        }
94
+
95
+        .bottomBox {
96
+            margin-top: 24px;
97
+
98
+            .item {
99
+                width: 100%;
100
+                height: 274px;
101
+            }
102
+
103
+            .item-text {
104
+                bottom: 5px;
105
+            }
106
+        }
107
+    }
108
+
109
+    .bottom-title-img {
110
+        width: 542px;
111
+        height: 105px;
112
+        margin: 24px 104px 0 104px;
113
+    }
114
+
115
+    // 商品列表盒子
116
+    .product-list-wrap {
117
+        margin: 0 16px;
118
+        width: 718px;
119
+        min-height: 1110px;
120
+        background: url('https://yushi.tos-cn-beijing.volces.com/activity/productListBg.png') no-repeat center center;
121
+        background-size: 100% 100%;
122
+        padding: 30px 20px 47px 27px;
123
+        box-sizing: border-box;
124
+
125
+        // tab分类
126
+        .tabs-list {
127
+            box-sizing: border-box;
128
+            padding: 0 34px;
129
+            display: flex;
130
+            overflow: hidden;
131
+
132
+            .at-tabs__header {
133
+                background-color: transparent;
134
+                height: 100%;
135
+                text-align: left;
136
+            }
137
+
138
+            .at-tabs__header::-webkit-scrollbar {
139
+                display: none;
140
+                /* 隐藏滚动条 */
141
+            }
142
+
143
+            scroll-view ::-webkit-scrollbar {
144
+                appearance: none;
145
+                color: transparent;
146
+                display: none;
147
+                width: 0;
148
+                height: 0;
149
+            }
150
+
151
+            .at-tabs__item {
152
+                color: #FFE1BA;
153
+                font-size: 26px;
154
+                padding: 0;
155
+                min-width: auto;
156
+                width: auto;
157
+                margin-right: 34px;
158
+                padding-bottom: 12px;
159
+                height: 100%;
160
+                line-height: 41px;
161
+
162
+                &--active {
163
+                    color: #fff;
164
+                    font-size: 28px;
165
+                    font-weight: bold;
166
+
167
+                    .at-tabs__item-underline {
168
+                        display: block;
169
+                        background-color: #fdd315;
170
+                        height: 8px;
171
+                        border-radius: 8px 8px 0 0;
172
+                        bottom: 0;
173
+                        width: 42px;
174
+                        left: 50%;
175
+                        transform: translateX(-50%);
176
+                    }
177
+                }
178
+
179
+                &:last-child {
180
+                    margin-right: 0;
181
+                }
182
+            }
183
+
184
+            .at-tabs__item-underline {
185
+                display: none;
186
+            }
187
+
188
+            .at-tabs__underline {
189
+                width: auto;
190
+            }
191
+        }
192
+
193
+        // 商品列表
194
+        .product-list {
195
+            margin-top: 24px;
196
+            height: 1000px;
197
+
198
+            .product-list-container {
199
+                display: flex;
200
+                flex-wrap: wrap;
201
+                justify-content: space-between;
202
+
203
+                .product-list-item {
204
+                    width: 331px;
205
+                    height: 493px;
206
+                    background: url('https://yushi.tos-cn-beijing.volces.com/activity/productImg.png') no-repeat center center;
207
+                    background-size: contain;
208
+                    margin-bottom: 7px;
209
+                    padding: 6px 20px 52px 11px;
210
+                    box-sizing: border-box;
211
+                    display: flex;
212
+                    flex-direction: column;
213
+
214
+                    .product-img {
215
+                        width: 100%;
216
+                        height: 262px;
217
+                        border-radius: 38px;
218
+                        background-color: red;
219
+                    }
220
+
221
+                    .product-content {
222
+                        margin-top: 10px;
223
+                        flex: 1;
224
+                        padding: 0 6px 0 25px;
225
+                        box-sizing: border-box;
226
+                        display: flex;
227
+                        flex-direction: column;
228
+                        justify-content: space-between;
229
+
230
+                        .product-title {
231
+                            font-weight: 700;
232
+                            font-size: 26px;
233
+                            color: #000000;
234
+                            line-height: 38px;
235
+                            height: 72px;
236
+                            display: -webkit-box;
237
+                            -webkit-box-orient: vertical;
238
+                            -webkit-line-clamp: 2;
239
+                            overflow: hidden;
240
+                            text-overflow: ellipsis;
241
+                        }
242
+
243
+                        .product-price {
244
+                            display: flex;
245
+                            align-items: center;
246
+                            justify-content: space-between;
247
+                            align-items: flex-end;
248
+
249
+                            .product-price-left {
250
+                                display: flex;
251
+                                flex-direction: column;
252
+                                font-weight: 700;
253
+                                font-size: 16px;
254
+                                color: #FD5608;
255
+                                line-height: 21px;
256
+
257
+                                .product-price-text-price {
258
+                                    font-size: 30px;
259
+                                    margin-top: 12px;
260
+                                }
261
+                            }
262
+                            .product-commission {
263
+                                text-align: center;
264
+                                line-height: 52px;
265
+                                width: 125px;
266
+                                height: 52px;
267
+                                border-radius: 30px;
268
+                                font-size: 26px;
269
+                                color: #FFFFFF;
270
+                                background: url('https://yushi.tos-cn-beijing.volces.com/activity/btn.png') no-repeat center center;
271
+                                background-size: 100% 100%;
272
+                            }
273
+                        }
274
+                    }
275
+                }
276
+                .loading {
277
+                    width: 100%;
278
+                    position: relative;
279
+                    height: 60px;
280
+                    .at-activity-indicator__content{
281
+                        color: #fff;
282
+                    }
283
+                  }
284
+            }
285
+
286
+        }
287
+    }
288
+}

+ 31 - 16
src/pages/indexSub/productDetail/index.jsx

@@ -35,6 +35,7 @@ export default class Index extends Component {
35 35
     shareJump: "", //分享跳转标识
36 36
     shareTitle: "", //分享标题
37 37
     shareUserId: "", //分享用户id
38
+    isShowBack: false, //是否显示返回
38 39
   };
39 40
   // 获取产品详情的方法
40 41
   fetchProductDetails = async (id) => {
@@ -76,8 +77,8 @@ export default class Index extends Component {
76 77
       shareUserId,
77 78
       tagTitle,
78 79
       shareType,
80
+      isShowBack,
79 81
     } = Taro.getCurrentInstance().router.params;
80
-
81 82
     let session_key = Taro.getStorageSync("session_key");
82 83
     let userInfo = Taro.getStorageSync("userInfo");
83 84
     let isShowSign = Taro.getStorageSync("isShowSign");
@@ -88,6 +89,7 @@ export default class Index extends Component {
88 89
         isSeckill: isSeckill === "true",
89 90
         shareUserId: shareUserId,
90 91
         tagTitle: tagTitle,
92
+        isShowBack: isShowBack === "true" || false,
91 93
       },
92 94
       () => {
93 95
         // 获取分享跳转标识
@@ -109,19 +111,20 @@ export default class Index extends Component {
109 111
         if (this.state.isSeckill) {
110 112
           this.handleLog("direct_to_product"); //埋点
111 113
         }
114
+        // 判断是否显示签约弹窗
115
+        if (
116
+          session_key &&
117
+          isShowSign !== false &&
118
+          userInfo &&
119
+          userInfo.user_identity == 0 &&
120
+          !this.state.isShare
121
+        ) {
122
+          this.setState({
123
+            isOpened: "sign",
124
+          });
125
+        }
112 126
       }
113 127
     );
114
-    // 判断是否显示签约弹窗
115
-    if (
116
-      session_key &&
117
-      isShowSign !== false &&
118
-      userInfo &&
119
-      userInfo.user_identity == 0
120
-    ) {
121
-      this.setState({
122
-        isOpened: "sign",
123
-      });
124
-    }
125 128
   }
126 129
   // 复制商品编号
127 130
   handleCopy = (text) => {
@@ -239,8 +242,13 @@ export default class Index extends Component {
239 242
         style={{ paddingTop: Taro.navigationBarHeight + "px" }}
240 243
       >
241 244
         {!this.state.isShare && (
242
-        <View className="back-btn" onClick={this.handleBack}>
243
-          <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
245
+          <View className="back-btn" onClick={this.handleBack}>
246
+            <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
247
+          </View>
248
+        )}
249
+        {this.state.isShowBack && (
250
+          <View className="back-btn" onClick={this.handleBack}>
251
+            <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
244 252
           </View>
245 253
         )}
246 254
         {/* 轮播图 */}
@@ -336,11 +344,18 @@ export default class Index extends Component {
336 344
         {/* 猜你喜欢产品列表 */}
337 345
         <View className="product-card-list">
338 346
           {this.state.productLikeList.map((product) => (
339
-            <ProductCard key={product.id} product={product} />
347
+            <ProductCard
348
+              key={product.id}
349
+              product={product}
350
+              isShowBack={this.state.isShowBack}
351
+              isShare={this.state.isShare}
352
+            />
340 353
           ))}
341 354
         </View>
342 355
         {/* 底部购买模块 */}
343
-        <View className={`bottom-buy ${this.state.isShare ? "share-active" : ""}`}>
356
+        <View
357
+          className={`bottom-buy ${this.state.isShare ? "share-active" : ""}`}
358
+        >
344 359
           {!this.state.isShare && (
345 360
             <View onClick={this.handleToHome} className="bottom-buy-left">
346 361
               <Image src={home} mode="aspectFit" />

+ 8 - 2
src/pages/indexSub/seckillIndex/index.jsx

@@ -25,9 +25,10 @@ export default class Index extends Component {
25 25
     isShare: false, // 是否是分享跳转
26 26
     shareUserId: "", // 分享用户id
27 27
     img: "", // 图片
28
+    isShowBack: false, // 是否显示返回
28 29
   };
29 30
   componentDidMount() {
30
-    const { isDirect, isBanner, isShare, shareUserId, title, id, shareJump,shareType } =
31
+    const { isDirect, isBanner, isShare, shareUserId, title, id, shareJump,shareType,isShowBack } =
31 32
       Taro.getCurrentInstance().router.params || "";
32 33
     let session_key = Taro.getStorageSync("session_key");
33 34
     this.setState(
@@ -38,12 +39,16 @@ export default class Index extends Component {
38 39
         shareUserId: shareUserId || "",
39 40
         title: title || "",
40 41
         id: id || "",
42
+        isShowBack: isShowBack || false,
41 43
       },
42 44
       () => {
43 45
         // 设置页面标题
44 46
         Taro.setNavigationBarTitle({
45 47
           title: this.state.title || "鱼市",
46 48
         });
49
+        if (isShare) {
50
+          Taro.hideHomeButton();//隐藏返回首页
51
+        }
47 52
         this.handleLog(
48 53
           isDirect
49 54
             ? `direct_to_${this.state.id}_${this.state.title}`
@@ -144,7 +149,7 @@ export default class Index extends Component {
144 149
       }).then((res) => {
145 150
         return {
146 151
           title: `${this.state.title}`,
147
-          path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}&&shareJump=${res.share_unique_value}&&shareType=3`,
152
+          path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}&&shareJump=${res.share_unique_value}&&shareType=3&&isShowBack=true`,
148 153
           imageUrl: "",
149 154
         };
150 155
       });
@@ -176,6 +181,7 @@ export default class Index extends Component {
176 181
             shareUserId={this.state.shareUserId}
177 182
             tagTitle={this.state.title}
178 183
             isShare={this.state.isShare}
184
+            isShowBack={this.state.isShowBack}
179 185
           />
180 186
         </View>
181 187
       </View>

+ 1 - 1
src/pages/indexSub/seckillIndex/index.less

@@ -8,6 +8,6 @@
8 8
         height: 300px;
9 9
     }
10 10
     .product-list{
11
-        margin-top: -71px;
11
+        margin-top: -196px;
12 12
     }
13 13
 }

+ 2 - 1
src/pages/memberSub/Alipay/index.jsx

@@ -21,7 +21,8 @@ export default class Index extends Component {
21 21
     isLoading: false, // 是否加载中
22 22
     isAlipay: false, // 是否已绑定支付宝
23 23
     isBank: false, // 是否已绑定银行卡
24
-    signImg: "https://video-img.fyshark.com/1735033624483%E5%B7%B2%E7%AD%BE%E7%BA%A6.png", // 签约码
24
+    signImg: "https://yushi.tos-cn-beijing.volces.com/mine/shenhezhong.png", // 审核中签约
25
+    // signImg: "https://video-img.fyshark.com/1735033624483%E5%B7%B2%E7%AD%BE%E7%BA%A6.png", // 签约码
25 26
   };
26 27
 
27 28
   componentDidMount () {

+ 9 - 3
src/pages/memberSub/storeManagement/index.jsx

@@ -26,6 +26,7 @@ export default class Index extends Component {
26 26
     isShare: false, // 是否是分享进入
27 27
     shopId: "", // 店铺id
28 28
     isNoMore: false, // 是否没有更多
29
+    isShowBack: false, // 是否显示返回
29 30
   };
30 31
   // 获取店铺详情
31 32
   getMyShopDetail = async () => {
@@ -67,7 +68,7 @@ export default class Index extends Component {
67 68
   };
68 69
 
69 70
   componentDidShow() {
70
-    const { isManager, shopId, isShare, shareJump,shareType } =
71
+    const { isManager, shopId, isShare, shareJump,shareType,isShowBack } =
71 72
       Taro.getCurrentInstance().router.params || "";
72 73
     let session_key = Taro.getStorageSync("session_key");
73 74
     this.setState(
@@ -75,10 +76,15 @@ export default class Index extends Component {
75 76
         isManager: JSON.parse(isManager), //是否是店长
76 77
         isShare: isShare || false, // 是否是分享进入
77 78
         shopId: shopId || "", // 店铺id
79
+        isShowBack: isShowBack || false, // 是否显示返回
78 80
       },
79 81
       () => {
80 82
         this.getMyShopDetail(); //获取店铺详情
81 83
         this.getMyShopList(true); //获取店铺数据
84
+        if (isShare) {
85
+          // 分享隐藏返回首页
86
+          Taro.hideHomeButton();
87
+        }
82 88
         // 获取分享跳转标识
83 89
         shareJump &&
84 90
           Taro.setStorage({
@@ -131,7 +137,7 @@ export default class Index extends Component {
131 137
     }).then((res) => {
132 138
       return {
133 139
         title: `${name||'分享者'}的店铺`,
134
-        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}&&shareType=2`,
140
+        path: `/pages/memberSub/storeManagement/index?shopId=${this.state.shopDetail.id}&isShare=true&isManager=false&&shareJump=${res.share_unique_value}&&shareType=2&&isShowBack=true`,
135 141
         imageUrl: "",
136 142
       };
137 143
     });
@@ -177,7 +183,7 @@ export default class Index extends Component {
177 183
           {productList && (
178 184
             <View className="product-card-list">
179 185
               {productList.map((product) => (
180
-                <ProductCard key={product.id} product={product} isShare={isShare}/>
186
+                <ProductCard isShowBack={this.state.isShowBack} key={product.id} product={product} isShare={isShare}/>
181 187
               ))}
182 188
             </View>
183 189
           )}

+ 1 - 0
src/service/activity.js

@@ -35,5 +35,6 @@ export const getCalculatorPartData = data =>
35 35
     method: 'POST',
36 36
     data,
37 37
   });
38
+//----------------------------------------------活动
38 39
 
39 40