Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp

project.config.json

@@ -28,7 +28,7 @@
 		},
 		"bundle": false,
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false,
 		"useMultiFrameRuntime": false,
 		"useApiHook": true,

src/components/PrizeChangeListItem/index.css

@@ -0,0 +1,42 @@
+.PrizeChangeListItem {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 12px;
+  padding: 30px 0;
+  align-items: center;
+}
+.PrizeChangeListItem > .Img {
+  width: 180px;
+  height: 180px;
+  position: relative;
+  overflow: hidden;
+  background: #eee;
+  margin-left: 30px;
+  margin-right: 30px;
+}
+.PrizeChangeListItem > .Img > image {
+  width: 100%;
+  height: 100%;
+}
+.PrizeChangeListItem > .flex-item {
+  margin-right: 30px;
+}
+.PrizeChangeListItem > .flex-item > text {
+  display: block;
+  font-size: 24px;
+  overflow: hidden;
+  line-height: 40px;
+  color: #999;
+}
+.PrizeChangeListItem > .flex-item > text:first-child {
+  font-size: 28px;
+  font-weight: bold;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  color: #333;
+}

src/components/PrizeChangeListItem/index.jsx

@@ -0,0 +1,24 @@
+import React, { } from 'react'
+import Taro from '@tarojs/taro'
+import toolclass from '@/utils/toolclass.js'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function PrizeChangeListItem (props) {
+
+  const { Data } = props
+
+  return (
+    <view className='PrizeChangeListItem flex-h'>
+      <view className='Img'>
+        <image mode='aspectFill' src={Data.image}></image>
+      </view>
+      <view className='flex-item'>
+        <text>{Data.targetName}</text>
+        <text>{Data.points}积分</text>
+        <text>兑换时间：{toolclass.FormatDate(Data.createDate)}</text>
+      </view>
+    </view>
+  )
+}

src/components/PrizeChangeListItem/index.less

@@ -0,0 +1,47 @@
+.PrizeChangeListItem {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 12px;
+  padding: 30px 0;
+  align-items: center;
+
+  >.Img {
+    width: 180px;
+    height: 180px;
+    position: relative;
+    overflow: hidden;
+    background: #eee;
+    margin-left: 30px;
+    margin-right: 30px;
+
+    >image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  >.flex-item {
+    margin-right: 30px;
+
+    >text {
+      display: block;
+      font-size: 24px;
+      overflow: hidden;
+      line-height: 40px;
+      color: #999;
+
+      &:first-child {
+        font-size: 28px;
+        font-weight: bold;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 2;
+        color: #333;
+      }
+    }
+  }
+}

src/components/WuYeJiaoFei/index.jsx

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

src/pages.js

@@ -325,6 +325,15 @@ const Other = [
       eventType: 'other',
     }
   },
+  {
+    name: '我的-我的订单',
+    page: 'pages/WoDe/WoDeDingDan/index',
+    auth: ['avatar', 'phone'],
+    track: {
+      event: 'list',
+      eventType: 'other',
+    }
+  },
 ]
 
 module.exports = [

src/pages/FuLi/ShangPinDuiHuan/index.jsx

@@ -35,6 +35,7 @@ export default function ShangPinDuiHuan () {
     setDataLock(true)
     request({ ...apis.exchangeGoods, args: { id: CurrnetId } }).then(() => {
       Taro.showToast({ title: `兑换成功`, icon: 'none' })
+      Taro.navigateTo({ url: `/pages/WoDe/WoDeDingDan/index` })
       setDataLock(false)
     }).catch((res) => {
       Taro.showToast({ title: res, icon: 'none' })
@@ -45,35 +46,35 @@ export default function ShangPinDuiHuan () {
   return (
     <Page>
       <view className='ShangPinDuiHuan'>
-      <view className='Info'>
-        <view className='Item flex-h'>
-          <view className='Img'>
-            <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
-          </view>
-          <view className='flex-item'>
-            <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
-            <view className='Num'>
-              <text>{GoodsDetail === null ? '' : GoodsDetail.totalNum}</text>
-              <text>人已兑换</text>
+        <view className='Info'>
+          <view className='Item flex-h'>
+            <view className='Img'>
+              <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
             </view>
-            <view className='flex-h'>
-              <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
-              <text>积分</text>
-              <view className='flex-item'></view>
-              <view className='EditNum flex-h'>
-                <text className='iconfont iconjian' onClick={() => { setCount(Count > 1 ? Count - 1 : 1) }}></text>
-                <Input type='number' value={Count} onInput={CountChange}></Input>
-                <text className='iconfont iconjia1' onClick={() => { setCount(Count - 0 + 1) }}></text>
+            <view className='flex-item'>
+              <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
+              <view className='Num'>
+                <text>{GoodsDetail === null ? '' : GoodsDetail.totalNum}</text>
+                <text>人已兑换</text>
+              </view>
+              <view className='flex-h'>
+                <text>{GoodsDetail === null ? '' : GoodsDetail.pointPrice}</text>
+                <text>积分</text>
+                <view className='flex-item'></view>
+                <view className='EditNum flex-h'>
+                  <text className='iconfont iconjian' onClick={() => { setCount(Count > 1 ? Count - 1 : 1) }}></text>
+                  <Input type='number' value={Count} onInput={CountChange}></Input>
+                  <text className='iconfont iconjia1' onClick={() => { setCount(Count - 0 + 1) }}></text>
+                </view>
               </view>
             </view>
           </view>
+          <view className='InfoBottom'></view>
+        </view>
+        <view className='BottomBtn'>
+          <text className={DataLock ? '' : 'active'} onClick={Submit}>{DataLock ? '正在提交...' : '确认兑换'}</text>
         </view>
-        <view className='InfoBottom'></view>
-      </view>
-      <view className='BottomBtn'>
-        <text className={DataLock ? '' : 'active'} onClick={Submit}>{DataLock ? '正在提交...' : '确认兑换'}</text>
       </view>
-    </view>
     </Page>
   )
 }

src/pages/FuLi/ShangPinXiangQing/index.css

@@ -1,9 +1,10 @@
 .ShangPinXiangQing {
-  width: 100%;
+  width: calc(100% -32rpx);
   min-height: 100%;
   position: relative;
   overflow: hidden;
   background: #f8f8f8;
+  padding: 0 16rpx;
 }
 .ShangPinXiangQing > .Info {
   position: relative;
@@ -12,14 +13,9 @@
 }
 .ShangPinXiangQing > .Info > .Img {
   width: 100%;
-  padding-bottom: 50%;
-  background: #ccc;
-  position: relative;
-  overflow: hidden;
 }
 .ShangPinXiangQing > .Info > .Img > image {
   width: 100%;
-  height: 100%;
 }
 .ShangPinXiangQing > .Info > .Title {
   padding: 20px 30px;
@@ -85,6 +81,13 @@
   color: #666;
   position: relative;
 }
+.ShangPinXiangQing > .Detail .Tips {
+  font-size: 24px;
+  color: #999;
+  line-height: 36px;
+  display: block;
+  padding: 40px 0;
+}
 .ShangPinXiangQing > .Detail > .BottomBtn {
   padding: 30px;
   position: relative;

src/pages/FuLi/ShangPinXiangQing/index.jsx

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

src/pages/FuLi/ShangPinXiangQing/index.less

@@ -98,6 +98,14 @@
       }
     }
 
+    .Tips {
+      font-size: 24px;
+      color: #999;
+      line-height: 36px;
+      display: block;
+      padding: 40px 0;
+    }
+
     >.BottomBtn {
       padding: 30px;
       position: relative;
@@ -112,6 +120,7 @@
         border-radius: 98px;
         text-align: center;
         display: block;
+
         &.active {
           background: #F35844;
         }

src/pages/HuoDong/HuoDongSign/index.jsx

@@ -29,7 +29,7 @@ export default function HuoDongDetail () {
   return (
     <Page>
       <view className='HuoDongSign'>
-        <image mode='widthFix' src={null}></image>
+        <image mode='widthFix' src='https://zhiyun-image.oss-cn-shanghai.aliyuncs.com/xiangsong/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20201218165430-min.jpg'></image>
         <view className={HasSign ? 'SignBtn' : 'SignBtn active'}>
           <view>
             <text className='centerLabel' onClick={ToSign}>{HasSign ? '已签到' : '签到'}</text>

src/pages/WoDe/WoDeDingDan/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '我的订单'
+}

src/pages/WoDe/WoDeDingDan/index.css

@@ -0,0 +1,20 @@
+.WoDeDingDan {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+}
+.WoDeDingDan .Content {
+  padding: 0 30px;
+  position: relative;
+  overflow: hidden;
+}
+.WoDeDingDan .Content > .ListItem {
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 30px;
+}
+.WoDeDingDan .Content > .ListItem:first-child {
+  margin-top: 30px;
+}

src/pages/WoDe/WoDeDingDan/index.jsx

@@ -0,0 +1,45 @@
+import React, { useState } from 'react'
+import PrizeChangeListItem from '@/components/PrizeChangeListItem'
+import ScrollPageRefresh from '@/components/ScrollPageRefresh'
+import Page from '@/layouts'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function WoDeDingDan () {
+
+  const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
+
+  const Refresh = (e) => { // 下拉刷新
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
+  }
+
+  const Push = (e) => { // 上拉加载
+    setPageList(PageList.concat(e))
+  }
+
+
+  return (
+    <Page>
+      <view className='WoDeDingDan'>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getUserChangePrizeList`} Refresh={Refresh} Push={Push}>
+          <view className='Content'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`PrizeItem-${index}`}>
+                  <PrizeChangeListItem Data={item}></PrizeChangeListItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
+  )
+}

src/pages/WoDe/WoDeDingDan/index.less

@@ -0,0 +1,22 @@
+.WoDeDingDan {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+
+  .Content {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+
+    >.ListItem {
+      position: relative;
+      overflow: hidden;
+      margin-bottom: 30px;
+      &:first-child {
+        margin-top: 30px;
+      }
+    }
+  }
+}

src/pages/WoDe/index.jsx

@@ -24,7 +24,8 @@ const menuGroup = [
   [
     { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },
     // { icon: 'iconfenxiang', name: '推荐分享', id: 6, router: '/pages/WoDe/TuiJianFenXiang/index' },
-    { icon: 'iconhuodong', name: '参与活动', id: 7, router: '/pages/WoDe/WoDeHuoDong/index' }
+    { icon: 'iconhuodong', name: '参与活动', id: 7, router: '/pages/WoDe/WoDeHuoDong/index' },
+    { icon: 'icondingdan', name: '我的订单', id: 7, router: '/pages/WoDe/WoDeDingDan/index' }
   ]
 ]
 

src/utils/api.js

@@ -1,6 +1,10 @@
 const prefix = `${HOST}/api/wx`
 
 const $api = {
+  getUserChangePrizeList: { // 兑换商品记录
+    method: 'get',
+    url: `${prefix}/taPointsExchange`
+  },
   PostOwnerScore: { // 用户给生活管家评分
     method: 'post',
     url: `${prefix}/tpLifeConsultantEvaluate`