From 6e57b2b095914b0f57f85338f09898280264e35c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 21 Apr 2023 13:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BB=A3=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppRedemptionPoints.vue                   | 398 ++++--------------
 .../fd/AppRedemptionPoints/goodsList.vue      | 370 ++++++++++++++++
 .../fd/AppRedemptionPoints/img/user-img.png   | Bin 0 -> 2424 bytes
 .../fd/AppRedemptionPoints/placeOrder.vue     |   4 +-
 .../fd/AppRedemptionPoints/productDetails.vue |   2 +-
 .../fd/AppRedemptionPoints/successOrder.vue   |   2 +-
 6 files changed, 452 insertions(+), 324 deletions(-)
 create mode 100644 src/project/fd/AppRedemptionPoints/goodsList.vue
 create mode 100644 src/project/fd/AppRedemptionPoints/img/user-img.png

diff --git a/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue
index cbcccbf6..16ed4eaa 100644
--- a/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue
+++ b/src/project/fd/AppRedemptionPoints/AppRedemptionPoints.vue
@@ -1,370 +1,128 @@
 <template>
   <div class="AppRedemptionPoints">
-    <div class="fixed-top">
-      <div class="header">
-        <div class="num">
-          <p>积分余额</p>
-          <h3>{{total}}</h3>
-        </div>
-        <!-- <div class="btn" @click="toMyOrder">我的订单</div> -->
-      </div>
-      <div class="search">
-        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="76" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
-          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs>
-        <div class="type-select">
-          <div :class="currentType == index ? 'item active' : 'item'" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">
-            {{item}}
-            <span v-if="index == 1" class="down-icon">⏷</span>
-          </div>
-        </div>
-        <div class="point-select" v-if="currentType == 1">
-          <u-tabs :list="pointTypeList" :is-scroll="true" :current="currentPoint" height="80" font-size="24" bg-color="#fff" inactive-color="#666666" 
-          active-color="#4181FF" bar-width="0" :bold="false" @change="pointClick" ></u-tabs>
-        </div>
-      </div>
-    </div>
+    <AiTopFixed>
+      <u-search v-model="keyword" :clearabled="false" placeholder="请输入申请人" :show-action="false" bg-color="#F5F5F5"
+        search-icon-color="#999" color="#666" @search="getListInit"></u-search>
+    </AiTopFixed>
     <div class="list-content">
-      <div class="left-list">
-        <div class="list-info" v-for="(item, index) in leftList" :key="index" v-if="goodsList.length">
-          <div class="item" @click="toProductDetail(item)">
-            <img :src="item.picUrl" alt="">
-            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGType', item.type) }}</div>
-            <div class="content">
-              <p class="text">{{item.title}}</p>
-              <div class="item-money">
-                <h3>{{item.integralPrice}}积分</h3>
-                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
-                <span v-if="item.type == 1">兑换后再付</span>
-              </div>
-              <div v-if="item.shopStatus == 1">
-                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
-                <div class="btn btn0" v-else>商品缺货</div>
-              </div>
-              <div v-else>
-                <div class="btn btn0">店铺停用</div>
-              </div>
-            </div>
-          </div>
+      <div class="item">
+        <div class="name">
+          <img src="./img/user-img.png" alt="">张三
+        </div>
+        <div class="total">
+          <span>积分总额：2350</span>
+          <span>积分余额：2350</span>
+        </div>
+        <div class="bottom" @click="toGoodsList">
+          <p>帮兑换</p>
+          <u-icon name="arrow-right" color="#CACACA" size="24" />
         </div>
       </div>
-      <div class="right-list">
-        <div class="list-info" v-for="(item, index) in rightList" :key="index" v-if="goodsList.length">
-          <div class="item" @click="toProductDetail(item)">
-            <img :src="item.picUrl" alt="">
-            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGType', item.type) }}</div>
-            <div class="content">
-              <p class="text">{{item.title}}</p>
-              <div class="item-money">
-                <h3>{{item.integralPrice}}积分</h3>
-                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
-                <span v-if="item.type == 1">兑换后再付</span>
-              </div>
-              <div v-if="item.shopStatus == 1">
-                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
-                <div class="btn btn0" v-else>商品缺货</div>
-              </div>
-              <div v-else>
-                <div class="btn btn0">店铺停用</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <AiEmpty v-if="!goodsList.length"></AiEmpty>
     </div>
+    <AiEmpty v-if="!list.length" />
+
   </div>
 </template>
 
 <script>
-import {mapState} from "vuex";
+import {mapState} from 'vuex'
 
 export default {
-  name: 'AppRedemptionPoints',
-  appName: '积分代兑换',
+  name: "AppRedemptionPoints",
+  appName: "积分代兑换",
   data() {
     return {
-      tabList: [{name: '全部'}, {name: '免费兑'}, {name: '京东低价商品'}],
-      currentTabs: 0,
-      barStyle: {
-        'width': '20px',
-        'height': '3px',
-        'border-radius': '2px',
-        'bottom': '-3px',
-        'background': '#2D7DFF'
-      },
-      typeList: ['最新上架', '积分', '我可兑换的'],
-      currentType: 0,
-      pointTypeList: [{name: '全部'}, {name: '50分以下'},  {name: '100分以下'},  {name: '200分以下'},  {name: '5000分以下'}],
-      currentPoint: 0,
-      goodsList: [],
-      leftList: [],
-      rightList: [],
-      total: 0,
+      list: [],
+      keyword: '',
       current: 1
     }
   },
   computed: {
     ...mapState(['user']),
   },
-  onLoad() {
-    this.getTotal()
-    this.$dict.load(['integralSGType']).then(() => {
-      this.getList()
-    })
-  },
   onShow() {
-    document.title = '积分代兑换'
-    this.getTotal()
+    document.title = "积分代兑换"
+    this.getList()
   },
+
   methods: {
-    getTotal() {
-      this.$http.post(`/app/appintegraluser/integralUserInfoFD`).then(res => {
-        if (res?.data) {
-          this.total = res.data.integral || 0
-        }
-      })
-    },
     getListInit() {
-      this.goodsList = []
-      this.leftList = []
-      this.rightList = []
       this.current = 1
       this.getList()
     },
     getList() {
-      this.$http.post(`/app/appintegralsupermarketshop/goodsListXCX`, null, {
-        params: {
-          goodsType: this.currentTabs,  //商品类型，0：全部、1：免费兑、2：京东低价商品，默认0
-          orderType: this.currentType == 0 ? 1 : 0,  //排序类型，0：积分升序、1：上架时间倒序，默认0
-          filterIntegral: this.currentType == 2 ? true : false,  //过滤我可兑换的，默认false
-          integralRange: this.currentType == 1 ? this.currentPoint : '',  //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0
-          current: this.current
-        }
-      }).then(res => {
-        if (res.code === 0) {
-          this.goodsList = this.current == 1 ? res.data.records : [...this.goodsList, ...res.data.records]
-          res.data.records.map((item, index) => {
-            if(index%2 ==0) {
-              this.leftList.push(item)
-            }else {
-              this.rightList.push(item)
-            }
-          })
-        }
-      })
-    },
-    changeTab(index) {
-      this.currentTabs = index
-      this.getListInit()
-    },
-    typeClick(index) {
-      this.currentType = index
-      this.getListInit()
-    },
-    pointClick(index) {
-      this.currentPoint = index
-      this.getListInit()
-    },
-    toProductDetail(item) {
-      uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}`})
-    },
-    toMyOrder() {
-      uni.navigateTo({url: './myOrderList'})
-    },
-    toOrder(item) {
-      if(this.total >= item.integralPrice && item.stock > 0) {
-        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=2`})
-      }
+      // this.$http.post(`/app/appconvenientaddressbook/list`, null, {
+      //   params: {
+      //     current: this.current,
+      //     name: this.keyword
+      //   }
+      // }).then(res => {
+      //   if (res.code == 0) {
+      //     this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records]
+      //   }
+      // })
     },
+    toGoodsList() {
+      uni.navigateTo({url: './goodsList'})
+    }
   },
   onReachBottom() {
     this.current ++
     this.getList()
-  },
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .AppRedemptionPoints {
-  .fixed-top {
-    background-color: #f3f6f9;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 2;
+  ::v-deep .fixed {
+    z-index: 9999;
   }
-  .header {
-    display: flex;
-    justify-content: space-between;
-    padding: 32px 24px;
-    background-color: #fff;
-    margin-bottom: 24px;
-    .num {
-      p {
-        font-family: PingFangSC-Regular;
-        font-weight: 400;
-        font-size: 24px;
-        color: #999;
-        line-height: 34px;
-      }
-      h3 {
-        font-family: PingFangSC-SNaNpxibold;
-        font-weight: 600;
-        font-size: 66px;
-        color: #FF6900;
-        line-height: 92px;
-      }
-    }
-    .btn {
-      width: 168px;
-      height: 64px;
-      border: 1px solid #4181FF;
-      line-height: 62px;
-      border-radius: 44px;
-      box-sizing: border-box;
-      text-align: center;
-      font-family: PingFangSC-Medium;
-      font-weight: 500;
-      font-size: 26px;
-      color: #4181FF;
-      margin-top: 28px;
-    }
-  }
-  .search {
-    background-color: #fff;
-    .type-select {
-      display: flex; 
-      border-top: 1px solid #D8D8D8;
-      line-height: 84px;
-      .item {
-        flex: 1;
-        text-align: center;
-        font-family: PingFangSC-Regular;
-        font-size: 26px;
-        color: #8891A1;
-        .down-icon {
-          display: inline-block;
-          margin-left: 8px;
-          transition: all 0.3s ease-in-out;
-          transform: rotate(0deg);
-        }
-      }
-      .active {
-        color: #4181FF;
-        .down-icon {
-          transform: rotate(180deg);
-        }
-      }
-    }
+  ::v-deep .u-search {
+    margin-bottom: 0 !important;
   }
   .list-content {
-    padding: 396px 0 24px 24px;
-    background-color: #f3f6f9;
-    overflow: hidden;
-    .left-list,
-    .right-list {
-      width: 50%;
-      float: left;
-    }
-    .list-info {
-      width: 100%;
-    }
+    padding: 32px;
     .item {
-      width: calc(100% - 24px);
+      width: 100%;
+      padding: 32px 30px 0;
       background-color: #fff;
-      border-radius: 20px;
-      position: relative;
-      margin-bottom: 24px;
-      img {
-        width: 100%;
-        height: 340px;
-        border-top-left-radius: 20px;
-        border-top-right-radius: 20px;
+      box-sizing: border-box;
+      border-radius: 8px;
+      .name {
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 32px;
+        color: #000;
+        line-height: 40px;
+        margin-bottom: 20px;
+        img {
+          width: 40px;
+          height: 40px;
+          margin-right: 12px;
+        }
       }
-      .type {
-        padding: 8px 16px;
+      .total {
         font-family: PingFangSC-Regular;
-        font-size: 20px;
-        line-height: 28px;
-        color: #FFF;
-        border-top-right-radius: 20px;
-        border-bottom-left-radius: 20px;
-        position: absolute;
-        top: 0;
-        right: 0;
-      }
-      .type1 {
-        background-color: #E64E39;
-      }
-      .type0 {
-        background-color: #FF6900;
-      }
-      .content {
-        padding: 16px 16px 24px;
-        position: relative;
-        background-color: #fff;
-        .text {
-          font-family: PingFangSC-SNaNpxibold;
-          font-weight: 600;
-          font-size: 26px;
-          color: #222;
-          line-height: 38px;
-          text-overflow: -o-ellipsis-lastline;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-line-clamp: 2;
-          line-clamp: 2;					
-          -webkit-box-orient: vertical;
-          margin-bottom: 12px;
-        }
-        .item-money {
-          width: calc(100% - 160px);
-          h3 {
-            font-family: PingFangSC-SNaNpxibold;
-            font-weight: 600;
-            font-size: 34px;
-            color: #FF6900;
-            line-height: 48px;
-          }
-          p {
-            font-family: PingFangSC;
-            font-weight: 600;
-            font-size: 26px;
-            color: #4181FF;
-          }
-          span {
-            display: inline-block;
-            font-family: PingFangSC-Regular;
-            font-weight: 400;
-            font-size: 20px;
-            color: #4181FF;
-            line-height: 22px;
-          }
-        }
-        .btn {
-          padding: 14px 32px;
-          font-family: PingFangSC-Medium;
-          font-weight: 500;
-          font-size: 22px;
-          line-height: 28px;
-          border-radius: 44px;
-          position: absolute;
-          bottom: 24px;
-          right: 16px;
-        }
-        .btn1 {
-          background-color: #2D7DFF;
-          color: #FFF;
-        }
-        .btn0 {
-          background-color: #E2E2E2;
-          color: #666;
+        font-size: 24px;
+        color: #666;
+        line-height: 34px;
+        padding-bottom: 34px;
+        span {
+          display: inline-block;
+          width: 250px;
         }
       }
-    }
-    .item:nth-of-type(2n-1) {
-      margin-right: 22px;
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        padding: 24px 0;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #000;
+        line-height: 38px;
+        border-top: 1px solid #eee;
+      }
     }
   }
 }
diff --git a/src/project/fd/AppRedemptionPoints/goodsList.vue b/src/project/fd/AppRedemptionPoints/goodsList.vue
new file mode 100644
index 00000000..c9159f79
--- /dev/null
+++ b/src/project/fd/AppRedemptionPoints/goodsList.vue
@@ -0,0 +1,370 @@
+<template>
+  <div class="goodsList">
+    <div class="fixed-top">
+      <div class="header">
+        <div class="num">
+          <p>积分余额</p>
+          <h3>{{total}}</h3>
+        </div>
+        <!-- <div class="btn" @click="toMyOrder">我的订单</div> -->
+      </div>
+      <div class="search">
+        <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="76" font-size="28" bg-color="#fff" inactive-color="#8891A1" 
+          active-color="#1D2229 " :bar-style="barStyle" @change="changeTab" ></u-tabs>
+        <div class="type-select">
+          <div :class="currentType == index ? 'item active' : 'item'" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">
+            {{item}}
+            <span v-if="index == 1" class="down-icon">⏷</span>
+          </div>
+        </div>
+        <div class="point-select" v-if="currentType == 1">
+          <u-tabs :list="pointTypeList" :is-scroll="true" :current="currentPoint" height="80" font-size="24" bg-color="#fff" inactive-color="#666666" 
+          active-color="#4181FF" bar-width="0" :bold="false" @change="pointClick" ></u-tabs>
+        </div>
+      </div>
+    </div>
+    <div class="list-content">
+      <div class="left-list">
+        <div class="list-info" v-for="(item, index) in leftList" :key="index" v-if="goodsList.length">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGType', item.type) }}</div>
+            <div class="content">
+              <p class="text">{{item.title}}</p>
+              <div class="item-money">
+                <h3>{{item.integralPrice}}积分</h3>
+                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
+                <span v-if="item.type == 1">兑换后再付</span>
+              </div>
+              <div v-if="item.shopStatus == 1">
+                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
+                <div class="btn btn0" v-else>商品缺货</div>
+              </div>
+              <div v-else>
+                <div class="btn btn0">店铺停用</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="right-list">
+        <div class="list-info" v-for="(item, index) in rightList" :key="index" v-if="goodsList.length">
+          <div class="item" @click="toProductDetail(item)">
+            <img :src="item.picUrl" alt="">
+            <div class="type" :class="`type`+item.type">{{ $dict.getLabel('integralSGType', item.type) }}</div>
+            <div class="content">
+              <p class="text">{{item.title}}</p>
+              <div class="item-money">
+                <h3>{{item.integralPrice}}积分</h3>
+                <p v-if="item.type == 1">+￥{{item.payMoney}}</p>
+                <span v-if="item.type == 1">兑换后再付</span>
+              </div>
+              <div v-if="item.shopStatus == 1">
+                <div class="btn" :class="total >= item.integralPrice ? 'btn1' : 'btn0'" @click.stop="toOrder(item)" v-if="item.stock > 0">{{total >= item.integralPrice ? '去兑换' : '积分不足'}}</div>
+                <div class="btn btn0" v-else>商品缺货</div>
+              </div>
+              <div v-else>
+                <div class="btn btn0">店铺停用</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty v-if="!goodsList.length"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: 'goodsList',
+  data() {
+    return {
+      tabList: [{name: '全部'}, {name: '免费兑'}, {name: '京东低价商品'}],
+      currentTabs: 0,
+      barStyle: {
+        'width': '20px',
+        'height': '3px',
+        'border-radius': '2px',
+        'bottom': '-3px',
+        'background': '#2D7DFF'
+      },
+      typeList: ['最新上架', '积分', '我可兑换的'],
+      currentType: 0,
+      pointTypeList: [{name: '全部'}, {name: '50分以下'},  {name: '100分以下'},  {name: '200分以下'},  {name: '5000分以下'}],
+      currentPoint: 0,
+      goodsList: [],
+      leftList: [],
+      rightList: [],
+      total: 0,
+      current: 1
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  onLoad() {
+    this.getTotal()
+    this.$dict.load(['integralSGType']).then(() => {
+      this.getList()
+    })
+  },
+  onShow() {
+    document.title = '积分代兑换'
+    this.getTotal()
+  },
+  methods: {
+    getTotal() {
+      this.$http.post(`/app/appintegraluser/integralUserInfoFD`).then(res => {
+        if (res?.data) {
+          this.total = res.data.integral || 0
+        }
+      })
+    },
+    getListInit() {
+      this.goodsList = []
+      this.leftList = []
+      this.rightList = []
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appintegralsupermarketshop/goodsListXCX`, null, {
+        params: {
+          goodsType: this.currentTabs,  //商品类型，0：全部、1：免费兑、2：京东低价商品，默认0
+          orderType: this.currentType == 0 ? 1 : 0,  //排序类型，0：积分升序、1：上架时间倒序，默认0
+          filterIntegral: this.currentType == 2 ? true : false,  //过滤我可兑换的，默认false
+          integralRange: this.currentType == 1 ? this.currentPoint : '',  //积分区间类型，0：全部、1：50分以下、2:100分以下、3：200分以下、4：5000分以下默认0
+          current: this.current
+        }
+      }).then(res => {
+        if (res.code === 0) {
+          this.goodsList = this.current == 1 ? res.data.records : [...this.goodsList, ...res.data.records]
+          res.data.records.map((item, index) => {
+            if(index%2 ==0) {
+              this.leftList.push(item)
+            }else {
+              this.rightList.push(item)
+            }
+          })
+        }
+      })
+    },
+    changeTab(index) {
+      this.currentTabs = index
+      this.getListInit()
+    },
+    typeClick(index) {
+      this.currentType = index
+      this.getListInit()
+    },
+    pointClick(index) {
+      this.currentPoint = index
+      this.getListInit()
+    },
+    toProductDetail(item) {
+      uni.navigateTo({url: `./productDetails?shopGoodsId=${item.shopGoodsId}&total=${this.total}`})
+    },
+    toMyOrder() {
+      uni.navigateTo({url: './myOrderList'})
+    },
+    toOrder(item) {
+      if(this.total >= item.integralPrice && item.stock > 0) {
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${item.shopGoodsId}&total=${this.total}&backLevel=3`})
+      }
+    },
+  },
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.goodsList {
+  .fixed-top {
+    background-color: #f3f6f9;
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 2;
+  }
+  .header {
+    display: flex;
+    justify-content: space-between;
+    padding: 32px 24px;
+    background-color: #fff;
+    margin-bottom: 24px;
+    .num {
+      p {
+        font-family: PingFangSC-Regular;
+        font-weight: 400;
+        font-size: 24px;
+        color: #999;
+        line-height: 34px;
+      }
+      h3 {
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 66px;
+        color: #FF6900;
+        line-height: 92px;
+      }
+    }
+    .btn {
+      width: 168px;
+      height: 64px;
+      border: 1px solid #4181FF;
+      line-height: 62px;
+      border-radius: 44px;
+      box-sizing: border-box;
+      text-align: center;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 26px;
+      color: #4181FF;
+      margin-top: 28px;
+    }
+  }
+  .search {
+    background-color: #fff;
+    .type-select {
+      display: flex; 
+      border-top: 1px solid #D8D8D8;
+      line-height: 84px;
+      .item {
+        flex: 1;
+        text-align: center;
+        font-family: PingFangSC-Regular;
+        font-size: 26px;
+        color: #8891A1;
+        .down-icon {
+          display: inline-block;
+          margin-left: 8px;
+          transition: all 0.3s ease-in-out;
+          transform: rotate(0deg);
+        }
+      }
+      .active {
+        color: #4181FF;
+        .down-icon {
+          transform: rotate(180deg);
+        }
+      }
+    }
+  }
+  .list-content {
+    padding: 396px 0 24px 24px;
+    background-color: #f3f6f9;
+    overflow: hidden;
+    .left-list,
+    .right-list {
+      width: 50%;
+      float: left;
+    }
+    .list-info {
+      width: 100%;
+    }
+    .item {
+      width: calc(100% - 24px);
+      background-color: #fff;
+      border-radius: 20px;
+      position: relative;
+      margin-bottom: 24px;
+      img {
+        width: 100%;
+        height: 340px;
+        border-top-left-radius: 20px;
+        border-top-right-radius: 20px;
+      }
+      .type {
+        padding: 8px 16px;
+        font-family: PingFangSC-Regular;
+        font-size: 20px;
+        line-height: 28px;
+        color: #FFF;
+        border-top-right-radius: 20px;
+        border-bottom-left-radius: 20px;
+        position: absolute;
+        top: 0;
+        right: 0;
+      }
+      .type1 {
+        background-color: #E64E39;
+      }
+      .type0 {
+        background-color: #FF6900;
+      }
+      .content {
+        padding: 16px 16px 24px;
+        position: relative;
+        background-color: #fff;
+        .text {
+          font-family: PingFangSC-SNaNpxibold;
+          font-weight: 600;
+          font-size: 26px;
+          color: #222;
+          line-height: 38px;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          line-clamp: 2;					
+          -webkit-box-orient: vertical;
+          margin-bottom: 12px;
+        }
+        .item-money {
+          width: calc(100% - 160px);
+          h3 {
+            font-family: PingFangSC-SNaNpxibold;
+            font-weight: 600;
+            font-size: 34px;
+            color: #FF6900;
+            line-height: 48px;
+          }
+          p {
+            font-family: PingFangSC;
+            font-weight: 600;
+            font-size: 26px;
+            color: #4181FF;
+          }
+          span {
+            display: inline-block;
+            font-family: PingFangSC-Regular;
+            font-weight: 400;
+            font-size: 20px;
+            color: #4181FF;
+            line-height: 22px;
+          }
+        }
+        .btn {
+          padding: 14px 32px;
+          font-family: PingFangSC-Medium;
+          font-weight: 500;
+          font-size: 22px;
+          line-height: 28px;
+          border-radius: 44px;
+          position: absolute;
+          bottom: 24px;
+          right: 16px;
+        }
+        .btn1 {
+          background-color: #2D7DFF;
+          color: #FFF;
+        }
+        .btn0 {
+          background-color: #E2E2E2;
+          color: #666;
+        }
+      }
+    }
+    .item:nth-of-type(2n-1) {
+      margin-right: 22px;
+    }
+  }
+}
+</style>
diff --git a/src/project/fd/AppRedemptionPoints/img/user-img.png b/src/project/fd/AppRedemptionPoints/img/user-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7eb9e0e18a8d4559588e692e0fc09d351688090
GIT binary patch
literal 2424
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

literal 0
HcmV?d00001

diff --git a/src/project/fd/AppRedemptionPoints/placeOrder.vue b/src/project/fd/AppRedemptionPoints/placeOrder.vue
index f388deaf..52572bed 100644
--- a/src/project/fd/AppRedemptionPoints/placeOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/placeOrder.vue
@@ -26,11 +26,11 @@
       </div>
       <div class="item-flex">
         <div class="label">支付积分</div>
-        <div class="value">减{{goodsNum*goodsInfo.integralPrice}}积分</div>
+        <div class="value">减{{(goodsNum*goodsInfo.integralPrice).toFixed(2)}}积分</div>
       </div>
       <div class="item-flex" v-if="goodsInfo.type == 1">
         <div class="label">京东支付</div>
-        <div class="value color-999">¥{{goodsNum*goodsInfo.payMoney}}</div>
+        <div class="value color-999">¥{{(goodsNum*goodsInfo.payMoney).toFixed(2)}}</div>
       </div>
     </div>
     <u-popup v-model="show" mode="bottom">
diff --git a/src/project/fd/AppRedemptionPoints/productDetails.vue b/src/project/fd/AppRedemptionPoints/productDetails.vue
index c2f7e83c..35c1a67d 100644
--- a/src/project/fd/AppRedemptionPoints/productDetails.vue
+++ b/src/project/fd/AppRedemptionPoints/productDetails.vue
@@ -59,7 +59,7 @@ export default {
     },
     toOrder() {
       if(this.total >= this.goodsInfo.integralPrice && this.goodsInfo.stock > 0 && this.goodsInfo.status == 1) {
-        uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=3`})
+        uni.navigateTo({url: `./placeOrder?shopGoodsId=${this.goodsInfo.shopGoodsId}&total=${this.total}&backLevel=4`})
       }
     },
   },
diff --git a/src/project/fd/AppRedemptionPoints/successOrder.vue b/src/project/fd/AppRedemptionPoints/successOrder.vue
index 0e622f2b..2b0106f2 100644
--- a/src/project/fd/AppRedemptionPoints/successOrder.vue
+++ b/src/project/fd/AppRedemptionPoints/successOrder.vue
@@ -51,7 +51,7 @@ export default {
       uni.navigateTo({url: `./jdH5?goodsJdUrl=${this.goodsJdUrl}`})
     },
     back() {
-      uni.navigateBack({delta: this.backLevel})
+      uni.navigateBack({delta: Number(this.backLevel)})
     },
     toOrderList() {
       uni.redirectTo({