xcx 4 лет назад
Родитель
Сommit
7e4fe9d149

+ 1
- 1
src/components/WuYeJiaoFei/index.jsx Просмотреть файл

@@ -155,7 +155,7 @@ export default function WuYeJiaoFei () {
155 155
                     <Checkbox className='CheckBoxItem' key={`WuYeJiaoFeiItem-${index}`} value={item.id} disabled={item.billStatus !== '0'}>
156 156
                       {/* <WuYeJiaoFeiItem Data={item}></WuYeJiaoFeiItem> */}
157 157
                       <view className='flex-h'>
158
-                        <view className='flex-item'>{item.billName}</view>
158
+                        <view className='flex-item'>{item.billInvoiceExplain}</view>
159 159
                         <view className='Price'>{`${item.payPrice} 元`}</view>
160 160
                       </view>
161 161
                     </Checkbox>

+ 24
- 23
src/pages/FuLi/ShangPinDuiHuan/index.jsx Просмотреть файл

@@ -35,6 +35,7 @@ export default function ShangPinDuiHuan () {
35 35
     setDataLock(true)
36 36
     request({ ...apis.exchangeGoods, args: { id: CurrnetId } }).then(() => {
37 37
       Taro.showToast({ title: `兑换成功`, icon: 'none' })
38
+      Taro.navigateTo({ url: `/pages/WoDe/WoDeDingDan/index` })
38 39
       setDataLock(false)
39 40
     }).catch((res) => {
40 41
       Taro.showToast({ title: res, icon: 'none' })
@@ -45,35 +46,35 @@ export default function ShangPinDuiHuan () {
45 46
   return (
46 47
     <Page>
47 48
       <view className='ShangPinDuiHuan'>
48
-      <view className='Info'>
49
-        <view className='Item flex-h'>
50
-          <view className='Img'>
51
-            <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
52
-          </view>
53
-          <view className='flex-item'>
54
-            <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
55
-            <view className='Num'>
56
-              <text>{GoodsDetail === null ? '' : GoodsDetail.totalNum}</text>
57
-              <text>人已兑换</text>
49
+        <view className='Info'>
50
+          <view className='Item flex-h'>
51
+            <view className='Img'>
52
+              <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
58 53
             </view>
59
-            <view className='flex-h'>
60
-              <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
61
-              <text>积分</text>
62
-              <view className='flex-item'></view>
63
-              <view className='EditNum flex-h'>
64
-                <text className='iconfont iconjian' onClick={() => { setCount(Count > 1 ? Count - 1 : 1) }}></text>
65
-                <Input type='number' value={Count} onInput={CountChange}></Input>
66
-                <text className='iconfont iconjia1' onClick={() => { setCount(Count - 0 + 1) }}></text>
54
+            <view className='flex-item'>
55
+              <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
56
+              <view className='Num'>
57
+                <text>{GoodsDetail === null ? '' : GoodsDetail.totalNum}</text>
58
+                <text>人已兑换</text>
59
+              </view>
60
+              <view className='flex-h'>
61
+                <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
62
+                <text>积分</text>
63
+                <view className='flex-item'></view>
64
+                <view className='EditNum flex-h'>
65
+                  <text className='iconfont iconjian' onClick={() => { setCount(Count > 1 ? Count - 1 : 1) }}></text>
66
+                  <Input type='number' value={Count} onInput={CountChange}></Input>
67
+                  <text className='iconfont iconjia1' onClick={() => { setCount(Count - 0 + 1) }}></text>
68
+                </view>
67 69
               </view>
68 70
             </view>
69 71
           </view>
72
+          <view className='InfoBottom'></view>
73
+        </view>
74
+        <view className='BottomBtn'>
75
+          <text className={DataLock ? '' : 'active'} onClick={Submit}>{DataLock ? '正在提交...' : '确认兑换'}</text>
70 76
         </view>
71
-        <view className='InfoBottom'></view>
72
-      </view>
73
-      <view className='BottomBtn'>
74
-        <text className={DataLock ? '' : 'active'} onClick={Submit}>{DataLock ? '正在提交...' : '确认兑换'}</text>
75 77
       </view>
76
-    </view>
77 78
     </Page>
78 79
   )
79 80
 }

+ 9
- 6
src/pages/FuLi/ShangPinXiangQing/index.css Просмотреть файл

@@ -1,9 +1,10 @@
1 1
 .ShangPinXiangQing {
2
-  width: 100%;
2
+  width: calc(100% -32rpx);
3 3
   min-height: 100%;
4 4
   position: relative;
5 5
   overflow: hidden;
6 6
   background: #f8f8f8;
7
+  padding: 0 16rpx;
7 8
 }
8 9
 .ShangPinXiangQing > .Info {
9 10
   position: relative;
@@ -12,14 +13,9 @@
12 13
 }
13 14
 .ShangPinXiangQing > .Info > .Img {
14 15
   width: 100%;
15
-  padding-bottom: 50%;
16
-  background: #ccc;
17
-  position: relative;
18
-  overflow: hidden;
19 16
 }
20 17
 .ShangPinXiangQing > .Info > .Img > image {
21 18
   width: 100%;
22
-  height: 100%;
23 19
 }
24 20
 .ShangPinXiangQing > .Info > .Title {
25 21
   padding: 20px 30px;
@@ -85,6 +81,13 @@
85 81
   color: #666;
86 82
   position: relative;
87 83
 }
84
+.ShangPinXiangQing > .Detail .Tips {
85
+  font-size: 24px;
86
+  color: #999;
87
+  line-height: 36px;
88
+  display: block;
89
+  padding: 40px 0;
90
+}
88 91
 .ShangPinXiangQing > .Detail > .BottomBtn {
89 92
   padding: 30px;
90 93
   position: relative;

+ 1
- 0
src/pages/FuLi/ShangPinXiangQing/index.jsx Просмотреть файл

@@ -55,6 +55,7 @@ export default function ShangPinXiangQing () {
55 55
             <text>产品详情</text>
56 56
           </view>
57 57
           <image mode='aspectFit' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
58
+          <text className='Tips'>免责申明:本站商品信息均来自于合作方,其真实性、准确性和合法性由信息拥有者(合作方)负责。本站不提供任何保证,并不承担任何法律责任</text>
58 59
           <view className='BottomBtn'>
59 60
             <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinDuiHuan/index?id=${CurrnetId}` }) }}>立即兑换</text>
60 61
           </view>

+ 9
- 0
src/pages/FuLi/ShangPinXiangQing/index.less Просмотреть файл

@@ -98,6 +98,14 @@
98 98
       }
99 99
     }
100 100
 
101
+    .Tips {
102
+      font-size: 24px;
103
+      color: #999;
104
+      line-height: 36px;
105
+      display: block;
106
+      padding: 40px 0;
107
+    }
108
+
101 109
     >.BottomBtn {
102 110
       padding: 30px;
103 111
       position: relative;
@@ -112,6 +120,7 @@
112 120
         border-radius: 98px;
113 121
         text-align: center;
114 122
         display: block;
123
+
115 124
         &.active {
116 125
           background: #F35844;
117 126
         }