吃个甘蔗嚼一年 3 lat temu
rodzic
commit
02c55fd152

+ 1
- 1
config/dev.js Wyświetl plik

@@ -4,7 +4,7 @@ module.exports = {
4 4
   },
5 5
   defineConstants: {
6 6
     // HOST: '"http://192.168.89.147:8080"',
7
-    HOST: '"http://sgl-v2-test.njyunzhi.com"',
7
+    HOST: '"https://sgl-v2.njyunzhi.com"',
8 8
     OSS: '"yz-shigongli.oss-accelerate.aliyuncs.com"',
9 9
   },
10 10
   mini: {},

+ 56
- 57
src/components/CollectList/MyCollect/index.jsx Wyświetl plik

@@ -28,63 +28,62 @@ export default (props) => {
28 28
   return (
29 29
 
30 30
     <View className='View-box-LR'>
31
-        {
32
-          targetType === "shop_package" && (
33
-            <View style={{ margin: '15px 5px' }}>
34
-              <CouponCard action={PayAction}>
35
-                <CouponMedia>
36
-                  <CouponMedia.Header
37
-                    cashback={item.cashback}
38
-                    image={compressImage(item.poster)}
39
-                    badge='food'
40
-                  />
41
-                  <CouponMedia.Body star={star}>
42
-                    <View className='cpn-card-text'>
43
-                      {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
44
-                    </View>
45
-                    <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
46
-                      <Text className='cpn-card-text_mn'>¥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
47
-                      <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
48
-                    </View>
49
-                    <View className='cpn-md-act'>
50
-                      <Location {...item} />
51
-                    </View>
52
-                  </CouponMedia.Body>
53
-                </CouponMedia>
54
-              </CouponCard>
55
-            </View>
56
-          )
57
-        }
58
-        {
59
-          targetType !== "shop_package" && (
60
-            <View style={{ margin: '15px 5px' }}>
61
-              <CouponCard action={PayAction}>
62
-                <CouponMedia>
63
-                  <CouponMedia.Header
64
-                    image={compressImage(item.poster)}
65
-                    badge={targetType}
66
-                  />
67
-                  <CouponMedia.Body >
68
-                    <View className='cpn-card-text'>
69
-                      {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
70
-                    </View>
71
-                    <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
72
-                      <Text className='cpn-card-text_mn'>¥{`${formatPrice(item.averagePrice)}元`}</Text>
73
-                    </View>
74
-
75
-                    <View className='cpn-md-act'>
76
-                      <Location {...item} />
77
-                      <view className='wdscbaozan'>
78
-                        <image className='title-on' src={ baozan} />
79
-                        <text className='title-on-text'>爆赞 {item.likeNum}</text>
80
-                      </view>
81
-                    </View>
82
-                  </CouponMedia.Body>
83
-                </CouponMedia>
84
-              </CouponCard>
85
-            </View>
86
-          )          
87
-        }
31
+      {
32
+        targetType === "shop_package" && (
33
+          <View style={{ margin: '15px 5px' }}>
34
+            <CouponCard action={PayAction}>
35
+              <CouponMedia>
36
+                <CouponMedia.Header
37
+                  cashback={item.cashback}
38
+                  image={compressImage(item.poster)}
39
+                  badge='food'
40
+                />
41
+                <CouponMedia.Body star={star}>
42
+                  <View className='cpn-card-text'>
43
+                    {(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}
44
+                  </View>
45
+                  <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
46
+                    <Text className='cpn-card-text_mn'>¥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
47
+                    <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
48
+                  </View>
49
+                  <View className='cpn-md-act'>
50
+                    <Location {...item} />
51
+                  </View>
52
+                </CouponMedia.Body>
53
+              </CouponMedia>
54
+            </CouponCard>
55
+          </View>
56
+        )
57
+      }
58
+      {
59
+        targetType !== "shop_package" && (
60
+          <View style={{ margin: '15px 5px' }}>
61
+            <CouponCard action={PayAction}>
62
+              <CouponMedia>
63
+                <CouponMedia.Header
64
+                  image={compressImage(item.poster)}
65
+                  badge={targetType}
66
+                />
67
+                <CouponMedia.Body >
68
+                  <View className='cpn-card-text'>
69
+                    {item.lng}
70
+                  </View>
71
+                  <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
72
+                    <Text className='cpn-card-text_mn'>¥{`${formatPrice(item.averagePrice)}元`}</Text>
73
+                  </View>
74
+                  <View className='cpn-md-act'>
75
+                    <Location {...item} />
76
+                    <view className='wdscbaozan'>
77
+                      <image className='title-on' src={baozan} />
78
+                      <text className='title-on-text'>爆赞 {item.likeNum}</text>
79
+                    </view>
80
+                  </View>
81
+                </CouponMedia.Body>
82
+              </CouponMedia>
83
+            </CouponCard>
84
+          </View>
85
+        )
86
+      }
88 87
     </View>
89 88
   )
90 89
 }

+ 1
- 1
src/pages/index/tabs/Guide.jsx Wyświetl plik

@@ -102,7 +102,7 @@ export default (props) => {
102 102
     if (taRoomContent?.parkingAddress === "") {
103 103
       setParkingButtonStyle('none')
104 104
     }
105
-  }, [roomId, roomGps, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
105
+  }, [roomId, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
106 106
 
107 107
 
108 108
   const goRoomMap = () => {

+ 0
- 2
src/shop/components/Sparead/spreadMoney.jsx Wyświetl plik

@@ -80,10 +80,8 @@ export default (props) => {
80 80
                 <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
81 81
               </view></view>
82 82
           </view>
83
-
84 83
         </view>
85 84
 
86
-
87 85
         <view className='title'>推广收入记录</view>
88 86
         <view style={{ height: '50vh' }}>
89 87