From 3954f6b756c40e61a44056adbc6c70bbbaa6b6db Mon Sep 17 00:00:00 2001
From: RIceWqy <1840169763@qq.com>
Date: Mon, 8 Jan 2024 21:13:09 +0800
Subject: [PATCH] init

---
 package.json                                  |    2 +-
 src/pages.json                                |   39 +-
 src/pages/basket/basket.vue                   |  522 ++++----
 .../member-info-detail/member-info-detail.vue |   22 +
 src/pages/member-info/member-info.scss        |  238 ++++
 src/pages/member-info/member-info.vue         |   22 +
 src/pages/member/member.scss                  |  125 ++
 src/pages/member/member.vue                   |  110 ++
 src/pages/order-detail/order-detail.vue       |   30 +-
 src/pages/prod/prod.vue                       | 1110 ++++++++---------
 src/pages/score/score.scss                    |  126 ++
 src/pages/score/score.vue                     |  110 ++
 src/pages/sub-category/sub-category.scss      |   18 +-
 src/pages/sub-category/sub-category.vue       |  217 ++--
 src/pages/submit-order/submit-order.vue       |  551 ++++----
 src/pages/user/user.vue                       |  418 +++----
 16 files changed, 2129 insertions(+), 1531 deletions(-)
 create mode 100644 src/pages/member-info-detail/member-info-detail.vue
 create mode 100644 src/pages/member-info/member-info.scss
 create mode 100644 src/pages/member-info/member-info.vue
 create mode 100644 src/pages/member/member.scss
 create mode 100644 src/pages/member/member.vue
 create mode 100644 src/pages/score/score.scss
 create mode 100644 src/pages/score/score.vue

diff --git a/package.json b/package.json
index 81d46f7..dd91b78 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
+    "preinstall": "npx only-allow npm",
     "dev:h5": "uni",
     "dev:h5-test": "uni --mode testing",
     "dev:mp-weixin": "uni -p mp-weixin",
diff --git a/src/pages.json b/src/pages.json
index e0115c2..b364482 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -149,12 +149,49 @@
         "navigationBarBackgroundColor": "#fafafa"
       }
     },
+    {
+      "path": "pages/score/score",
+      "style": {
+        "backgroundTextStyle": "light",
+        "navigationBarTitleText": "积分商城",
+        "navigationBarTextStyle": "black",
+        "navigationBarBackgroundColor": "#fafafa"
+      }
+    },
+    {
+      "path": "pages/member/member",
+      "style": {
+        "backgroundTextStyle": "light",
+        "navigationBarTitleText": "会员专区",
+        "navigationBarTextStyle": "black",
+        "navigationBarBackgroundColor": "#fafafa"
+      }
+    },
+    {
+      "path": "pages/member-info/member-info",
+      "style": {
+        "backgroundTextStyle": "light",
+        "navigationBarTitleText": "会员信息",
+        "navigationBarTextStyle": "black",
+        "navigationBarBackgroundColor": "#fafafa"
+      }
+    },
+    {
+      "path": "pages/member-info-detail/member-info-detail",
+      "style": {
+        "backgroundTextStyle": "light",
+        "navigationBarTitleText": "会员信息详情",
+        "navigationBarTextStyle": "black",
+        "navigationBarBackgroundColor": "#fafafa"
+      }
+    },
     {
       "path": "pages/accountLogin/accountLogin"
     },
     {
       "path": "pages/register/register"
-    }
+    },
+   
   ],
   "tabBar": {
     "selectedColor": "#3a86b9",
diff --git a/src/pages/basket/basket.vue b/src/pages/basket/basket.vue
index b8e810a..3ad9809 100644
--- a/src/pages/basket/basket.vue
+++ b/src/pages/basket/basket.vue
@@ -1,15 +1,9 @@
 <template>
   <view class="container">
     <view class="prod-list">
-      <block
-        v-for="(item, scIndex) in shopCartItemDiscounts"
-        :key="scIndex"
-      >
+      <block v-for="(item, scIndex) in shopCartItemDiscounts" :key="scIndex">
         <view class="prod-block">
-          <view
-            v-if="item.chooseDiscountItemDto"
-            class="discount-tips"
-          >
+          <view v-if="item.chooseDiscountItemDto" class="discount-tips">
             <text class="text-block">
               {{ wxs.parseDiscount(item.chooseDiscountItemDto.discountRule) }}
             </text>
@@ -19,21 +13,12 @@
               }}
             </text>
           </view>
-          <block
-            v-for="(prod, index) in item.shopCartItems"
-            :key="index"
-          >
+          <block v-for="(prod, index) in item.shopCartItems" :key="index">
             <view class="item">
               <view class="btn">
                 <label>
-                  <checkbox
-                    :data-scindex="scIndex"
-                    :data-index="index"
-                    :value="prod.prodId"
-                    :checked="prod.checked"
-                    color="#105c3e"
-                    @tap="onSelectedItem"
-                  />
+                  <checkbox :data-scindex="scIndex" :data-index="index" :value="prod.prodId" :checked="prod.checked"
+                    color="#105c3e" @tap="onSelectedItem" />
                 </label>
               </view>
               <view class="prodinfo">
@@ -48,7 +33,7 @@
                     {{ prod.skuName }}
                   </text>
                   <view class="price-count">
-                    <view class="price">
+                    <view class="price" v-if="prod.productType != 2">
                       <text class="symbol">
                         ￥
                       </text>
@@ -59,24 +44,16 @@
                         .{{ wxs.parsePrice(prod.price)[1] }}
                       </text>
                     </view>
+                    <view class="price" v-if="prod.productType == 2">
+                      <text class="price-num">
+                        {{prod.payScore }}
+                      </text>
+                      积分
+                    </view>
                     <view class="m-numSelector">
-                      <view
-                        class="minus"
-                        :data-scindex="scIndex"
-                        :data-index="index"
-                        @tap="onCountMinus"
-                      />
-                      <input
-                        type="number"
-                        :value="prod.prodCount"
-                        disabled
-                      >
-                      <view
-                        class="plus"
-                        :data-scindex="scIndex"
-                        :data-index="index"
-                        @tap="onCountPlus"
-                      />
+                      <view class="minus" :data-scindex="scIndex" :data-index="index" @tap="onCountMinus" />
+                      <input type="number" :value="prod.prodCount" disabled>
+                      <view class="plus" :data-scindex="scIndex" :data-index="index" @tap="onCountPlus" />
                     </view>
                   </view>
                 </view>
@@ -87,10 +64,7 @@
       </block>
     </view>
 
-    <view
-      v-if="!shopCartItemDiscounts.length"
-      class="empty"
-    >
+    <view v-if="!shopCartItemDiscounts.length" class="empty">
       <view class="img">
         <image src="@/static/images/tabbar/basket.png" />
       </view>
@@ -100,28 +74,26 @@
     </view>
 
     <!-- 底部按钮 -->
-    <view
-      v-if="shopCartItemDiscounts.length>0"
-      class="cart-footer"
-    >
+    <view v-if="shopCartItemDiscounts.length>0" class="cart-footer">
       <view class="btn all">
-        <checkbox
-          :checked="allChecked"
-          color="#f7d731;"
-          @tap="onSelAll"
-        />
+        <checkbox :checked="allChecked" color="#f7d731;" @tap="onSelAll" />
         全选
       </view>
-      <view
-        class="btn del"
-        @tap="onDelBasket"
-      >
+      <view class="btn del" @tap="onDelBasket">
         <text>删除</text>
       </view>
       <view class="btn total">
         <view class="finally">
           <text>合计:</text>
+
           <view class="price">
+            <view v-if="totalScore > 0">
+            
+              <text class="price-num">
+                {{totalScore }}
+              </text>
+              积分+
+            </view>
             <text class="symbol">
               ￥
             </text>
@@ -133,17 +105,11 @@
             </text>
           </view>
         </view>
-        <view
-          v-if="subtractMoney>0"
-          class="total-msg"
-        >
+        <view v-if="subtractMoney>0" class="total-msg">
           总额:￥{{ wxs.toPrice(totalMoney) }} 立减:￥{{ wxs.toPrice(subtractMoney) }}
         </view>
       </view>
-      <view
-        class="btn settle"
-        @tap="toFirmOrder"
-      >
+      <view class="btn settle" @tap="toFirmOrder">
         <text>结算</text>
       </view>
     </view>
@@ -152,250 +118,256 @@
 </template>
 
 <script setup>
-const wxs = number()
-/**
- * 生命周期函数--监听页面显示
- */
-onShow(() => {
-  loadBasketData()
-  http.getCartCount() // 重新计算购物车总数量
-})
-
-const allChecked = ref(false)
-const shopCartItemDiscounts = ref([])
-const loadBasketData = () => {
-  uni.showLoading() // 加载购物车
-  http.request({
-    url: '/p/shopCart/info',
-    method: 'POST',
-    data: {}
+  const wxs = number()
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(() => {
+    loadBasketData()
+    http.getCartCount() // 重新计算购物车总数量
   })
-    .then(({ data }) => {
-      if (data.length > 0) {
-      // 默认不选中
-        const shopCartItemDiscountsParam = data[0].shopCartItemDiscounts
-        shopCartItemDiscountsParam.forEach(shopCartItemDiscount => {
-          shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
-            shopCartItem.checked = false
+
+  const allChecked = ref(false)
+  const shopCartItemDiscounts = ref([])
+  const loadBasketData = () => {
+    uni.showLoading() // 加载购物车
+    http.request({
+        url: '/p/shopCart/info',
+        method: 'POST',
+        data: {}
+      })
+      .then(({
+        data
+      }) => {
+        if (data.length > 0) {
+          // 默认不选中
+          const shopCartItemDiscountsParam = data[0].shopCartItemDiscounts
+          shopCartItemDiscountsParam.forEach(shopCartItemDiscount => {
+            shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
+              shopCartItem.checked = false
+            })
           })
-        })
-        shopCartItemDiscounts.value = shopCartItemDiscountsParam
-        allChecked.value = false
-      } else {
-        shopCartItemDiscounts.value = []
-      }
-      calTotalPrice() // 计算总价
-      uni.hideLoading()
-    })
-}
+          shopCartItemDiscounts.value = shopCartItemDiscountsParam
+          allChecked.value = false
+        } else {
+          shopCartItemDiscounts.value = []
+        }
+        calTotalPrice() // 计算总价
+        uni.hideLoading()
+      })
+  }
 
-/**
- * 去结算
- */
-const toFirmOrder = () => {
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  const basketIds = []
-  shopCartItemDiscountsParam.forEach(shopCartItemDiscount => {
-    shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
-      if (shopCartItem.checked) {
-        basketIds.push(shopCartItem.basketId)
-      }
+  /**
+   * 去结算
+   */
+  const toFirmOrder = () => {
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    const basketIds = []
+    shopCartItemDiscountsParam.forEach(shopCartItemDiscount => {
+      shopCartItemDiscount.shopCartItems.forEach(shopCartItem => {
+        if (shopCartItem.checked) {
+          basketIds.push(shopCartItem.basketId)
+        }
+      })
     })
-  })
 
-  if (!basketIds.length) {
-    uni.showToast({
-      title: '请选择商品',
-      icon: 'none'
+    if (!basketIds.length) {
+      uni.showToast({
+        title: '请选择商品',
+        icon: 'none'
+      })
+      return
+    }
+
+    uni.setStorageSync('basketIds', JSON.stringify(basketIds))
+    uni.navigateTo({
+      url: '/pages/submit-order/submit-order?orderEntry=0'
     })
-    return
   }
 
-  uni.setStorageSync('basketIds', JSON.stringify(basketIds))
-  uni.navigateTo({
-    url: '/pages/submit-order/submit-order?orderEntry=0'
-  })
-}
-
-/**
- * 全选
- */
-const onSelAll = () => {
-  const allCheckedParam = !allChecked.value // 改变状态
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
-    const cItems = shopCartItemDiscountsParam[i].shopCartItems
-    for (let j = 0; j < cItems.length; j++) {
-      cItems[j].checked = allCheckedParam
+  /**
+   * 全选
+   */
+  const onSelAll = () => {
+    const allCheckedParam = !allChecked.value // 改变状态
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
+      const cItems = shopCartItemDiscountsParam[i].shopCartItems
+      for (let j = 0; j < cItems.length; j++) {
+        cItems[j].checked = allCheckedParam
+      }
     }
+    allChecked.value = allCheckedParam
+    shopCartItemDiscounts.value = shopCartItemDiscountsParam
+    calTotalPrice() // 计算总价
   }
-  allChecked.value = allCheckedParam
-  shopCartItemDiscounts.value = shopCartItemDiscountsParam
-  calTotalPrice() // 计算总价
-}
 
-/**
- * 每一项的选择事件
- * +
- */
-const onSelectedItem = (e) => {
-  const index = e.currentTarget.dataset.index // 获取data- 传进来的index
-  const scindex = e.currentTarget.dataset.scindex
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value // 获取购物车列表
-  const checked = shopCartItemDiscountsParam[scindex].shopCartItems[index].checked // 获取当前商品的选中状态
-  shopCartItemDiscountsParam[scindex].shopCartItems[index].checked = !checked // 改变状态
-  shopCartItemDiscounts.value = shopCartItemDiscountsParam
-  checkAllSelected() // 检查全选状态
-  calTotalPrice() // 计算总价
-}
+  /**
+   * 每一项的选择事件
+   * +
+   */
+  const onSelectedItem = (e) => {
+    const index = e.currentTarget.dataset.index // 获取data- 传进来的index
+    const scindex = e.currentTarget.dataset.scindex
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value // 获取购物车列表
+    const checked = shopCartItemDiscountsParam[scindex].shopCartItems[index].checked // 获取当前商品的选中状态
+    shopCartItemDiscountsParam[scindex].shopCartItems[index].checked = !checked // 改变状态
+    shopCartItemDiscounts.value = shopCartItemDiscountsParam
+    checkAllSelected() // 检查全选状态
+    calTotalPrice() // 计算总价
+  }
 
-/**
- * 检查全选状态
- */
-const checkAllSelected = () => {
-  let allCheckedParam = true
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  let flag = false
-  for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
-    const cItems = shopCartItemDiscountsParam[i].shopCartItems
-    for (let j = 0; j < cItems.length; j++) {
-      if (!cItems[j].checked) {
-        allCheckedParam = !allCheckedParam
-        flag = true
-        break
+  /**
+   * 检查全选状态
+   */
+  const checkAllSelected = () => {
+    let allCheckedParam = true
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    let flag = false
+    for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
+      const cItems = shopCartItemDiscountsParam[i].shopCartItems
+      for (let j = 0; j < cItems.length; j++) {
+        if (!cItems[j].checked) {
+          allCheckedParam = !allCheckedParam
+          flag = true
+          break
+        }
       }
+      if (flag) break
     }
-    if (flag) break
+    allChecked.value = allCheckedParam
   }
-  allChecked.value = allCheckedParam
-}
 
-const totalMoney = ref(0)
-const subtractMoney = ref(0)
-const finalMoney = ref(0)
-/**
- * 计算购物车总额
- */
-const calTotalPrice = () => {
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  const shopCartIds = []
-  for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
-    const cItems = shopCartItemDiscountsParam[i].shopCartItems
-    for (let j = 0; j < cItems.length; j++) {
-      if (cItems[j].checked) {
-        shopCartIds.push(cItems[j].basketId)
+  const totalMoney = ref(0)
+  const subtractMoney = ref(0)
+  const totalScore = ref(0)
+  const finalMoney = ref(0)
+  /**
+   * 计算购物车总额
+   */
+  const calTotalPrice = () => {
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    const shopCartIds = []
+    for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
+      const cItems = shopCartItemDiscountsParam[i].shopCartItems
+      for (let j = 0; j < cItems.length; j++) {
+        if (cItems[j].checked) {
+          shopCartIds.push(cItems[j].basketId)
+        }
       }
     }
+    uni.showLoading()
+    http.request({
+        url: '/p/shopCart/totalPay',
+        method: 'POST',
+        data: shopCartIds
+      })
+      .then(({
+        data
+      }) => {
+        finalMoney.value = data.finalMoney
+        totalMoney.value = data.totalMoney
+        totalScore.value = data.totalScore
+        subtractMoney.value = data.subtractMoney
+        uni.hideLoading()
+      })
   }
-  uni.showLoading()
-  http.request({
-    url: '/p/shopCart/totalPay',
-    method: 'POST',
-    data: shopCartIds
-  })
-    .then(({ data }) => {
-      finalMoney.value = data.finalMoney
-      totalMoney.value = data.totalMoney
-      subtractMoney.value = data.subtractMoney
-      uni.hideLoading()
-    })
-}
 
-/**
- * 减少数量
- */
-const onCountMinus = (e) => {
-  const index = e.currentTarget.dataset.index
-  const scindex = e.currentTarget.dataset.scindex
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  const prodCount = shopCartItemDiscountsParam[scindex].shopCartItems[index].prodCount
-  if (prodCount > 1) {
-    updateCount(shopCartItemDiscountsParam, scindex, index, -1)
+  /**
+   * 减少数量
+   */
+  const onCountMinus = (e) => {
+    const index = e.currentTarget.dataset.index
+    const scindex = e.currentTarget.dataset.scindex
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    const prodCount = shopCartItemDiscountsParam[scindex].shopCartItems[index].prodCount
+    if (prodCount > 1) {
+      updateCount(shopCartItemDiscountsParam, scindex, index, -1)
+    }
   }
-}
 
-/**
- * 增加数量
- */
-const onCountPlus = (e) => {
-  const index = e.currentTarget.dataset.index
-  const scindex = e.currentTarget.dataset.scindex
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  updateCount(shopCartItemDiscountsParam, scindex, index, 1)
-}
+  /**
+   * 增加数量
+   */
+  const onCountPlus = (e) => {
+    const index = e.currentTarget.dataset.index
+    const scindex = e.currentTarget.dataset.scindex
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    updateCount(shopCartItemDiscountsParam, scindex, index, 1)
+  }
 
-/**
- * 改变购物车数量接口
- */
-const updateCount = (shopCartItemDiscountsParam, scindex, index, prodCount) => {
-  uni.showLoading({
-    mask: true
-  })
-  http.request({
-    url: '/p/shopCart/changeItem',
-    method: 'POST',
-    data: {
-      count: prodCount,
-      prodId: shopCartItemDiscountsParam[scindex].shopCartItems[index].prodId,
-      skuId: shopCartItemDiscountsParam[scindex].shopCartItems[index].skuId,
-      shopId: 1
-    }
-  })
-    .then(() => {
-      shopCartItemDiscountsParam[scindex].shopCartItems[index].prodCount += prodCount
-      shopCartItemDiscounts.value = shopCartItemDiscountsParam
-      calTotalPrice() // 计算总价
-      uni.hideLoading()
-      http.getCartCount() // 重新计算购物车总数量
+  /**
+   * 改变购物车数量接口
+   */
+  const updateCount = (shopCartItemDiscountsParam, scindex, index, prodCount) => {
+    uni.showLoading({
+      mask: true
     })
-}
+    http.request({
+        url: '/p/shopCart/changeItem',
+        method: 'POST',
+        data: {
+          count: prodCount,
+          prodId: shopCartItemDiscountsParam[scindex].shopCartItems[index].prodId,
+          skuId: shopCartItemDiscountsParam[scindex].shopCartItems[index].skuId,
+          shopId: 1
+        }
+      })
+      .then(() => {
+        shopCartItemDiscountsParam[scindex].shopCartItems[index].prodCount += prodCount
+        shopCartItemDiscounts.value = shopCartItemDiscountsParam
+        calTotalPrice() // 计算总价
+        uni.hideLoading()
+        http.getCartCount() // 重新计算购物车总数量
+      })
+  }
 
-/**
- * 删除购物车商品
- */
-const onDelBasket = () => {
-  const shopCartItemDiscountsParam = shopCartItemDiscounts.value
-  const basketIds = []
-  for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
-    const cItems = shopCartItemDiscountsParam[i].shopCartItems
-    for (let j = 0; j < cItems.length; j++) {
-      if (cItems[j].checked) {
-        basketIds.push(cItems[j].basketId)
+  /**
+   * 删除购物车商品
+   */
+  const onDelBasket = () => {
+    const shopCartItemDiscountsParam = shopCartItemDiscounts.value
+    const basketIds = []
+    for (let i = 0; i < shopCartItemDiscountsParam.length; i++) {
+      const cItems = shopCartItemDiscountsParam[i].shopCartItems
+      for (let j = 0; j < cItems.length; j++) {
+        if (cItems[j].checked) {
+          basketIds.push(cItems[j].basketId)
+        }
       }
     }
-  }
-  if (!basketIds.length) {
-    uni.showToast({
-      title: '请选择商品',
-      icon: 'none'
-    })
-  } else {
-    uni.showModal({
-      title: '',
-      content: '确认要删除选中的商品吗？',
-      confirmColor: '#eb2444',
-      success (res) {
-        if (res.confirm) {
-          uni.showLoading({
-            mask: true
-          })
-          http.request({
-            url: '/p/shopCart/deleteItem',
-            method: 'DELETE',
-            data: basketIds
-          })
-            .then(() => {
-              uni.hideLoading()
-              loadBasketData()
+    if (!basketIds.length) {
+      uni.showToast({
+        title: '请选择商品',
+        icon: 'none'
+      })
+    } else {
+      uni.showModal({
+        title: '',
+        content: '确认要删除选中的商品吗？',
+        confirmColor: '#eb2444',
+        success(res) {
+          if (res.confirm) {
+            uni.showLoading({
+              mask: true
             })
+            http.request({
+                url: '/p/shopCart/deleteItem',
+                method: 'DELETE',
+                data: basketIds
+              })
+              .then(() => {
+                uni.hideLoading()
+                loadBasketData()
+              })
+          }
         }
-      }
 
-    })
+      })
+    }
   }
-}
 </script>
 
 <style scoped lang="scss">
-@import "./basket.scss";
+  @import "./basket.scss";
 </style>
diff --git a/src/pages/member-info-detail/member-info-detail.vue b/src/pages/member-info-detail/member-info-detail.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/src/pages/member-info-detail/member-info-detail.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/src/pages/member-info/member-info.scss b/src/pages/member-info/member-info.scss
new file mode 100644
index 0000000..547b964
--- /dev/null
+++ b/src/pages/member-info/member-info.scss
@@ -0,0 +1,238 @@
+.container {
+  background-color: #f7f7f7;
+  padding-bottom: 60rpx;
+}.price {
+				font-size: 30rpx;
+				color: #ff3000;
+				font-weight: 600;
+
+				&::before {
+					content: '￥';
+					font-size: 24rpx;
+				}
+			}
+
+			.origin-price {
+				font-size: 26rpx;
+				font-weight: 400;
+				text-decoration: line-through;
+				color: #c4c4c4;
+			}
+.userinfo {
+  position: relative;
+  width: 100%;
+  background: #fff;
+  text-align: center;
+  padding: 30rpx 0;
+  .userinfo-con {
+    width: 240rpx;
+    margin: auto;
+    .userinfo-avatar {
+      overflow: hidden;
+      display: block;
+      width: 160rpx;
+      height: 160rpx;
+      border-radius: 50%;
+      box-shadow: 3px 3px 10px rgba(0, 0, 0, 0.2);
+      margin: auto;
+      image {
+        width: 160rpx;
+        height: 160rpx;
+      }
+    }
+    .userinfo-name {
+      font-size: 30rpx;
+      font-weight: bold;
+      margin-top: 20rpx;
+      overflow: hidden;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      text-overflow: ellipsis;
+      word-break: break-all;
+    }
+  }
+}
+.userinfo-none {
+  display: flex;
+  padding: 30rpx;
+  background: #fff;
+  align-items: center;
+  .default-pic {
+    padding-right: 30rpx;
+    image {
+      width: 160rpx;
+      height: 160rpx;
+    }
+  }
+}
+.none-login {
+  button {
+    background: #fff;
+    &::after {
+      border: 0;
+    }
+  }
+  .unlogin {
+    font-size: 30rpx;
+    text-align: left;
+    padding: 0;
+  }
+  .click-login {
+    font-size: 26rpx;
+    color: #777;
+    text-align: left;
+    padding: 0;
+  }
+}
+.binding-phone {
+  position: relative;
+  background: #fff;
+  height: 80rpx;
+  line-height: 80rpx;
+  padding: 0 30rpx;
+  border-top: 2rpx solid #f7f7f7;
+  border-bottom: 2rpx solid #f7f7f7;
+  .show-tip {
+    font-size: 26rpx;
+  }
+  .gotobinding {
+    border-radius: 8rpx;
+    font-size: 28rpx;
+    color: #e24b4b;
+    font-weight: bold;
+  }
+}
+.list-cont {
+  width: 100%;
+  background: #f7f7f7;
+  margin-top: 20rpx;
+  .total-order {
+    background: #fff;
+    .order-tit {
+      display: flex;
+      justify-content: space-between;
+      height: 80rpx;
+      line-height: 80rpx;
+      font-size: 30rpx;
+      border-bottom: 1px solid #f7f7f7;
+      padding: 0 30rpx;
+      .checkmore {
+        font-size: 22rpx;
+        color: #80848f;
+        display: flex;
+        align-items: center;
+      }
+    }
+    .procedure {
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      font-size: 25rpx;
+      height: 160rpx;
+      .items {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        image {
+          width: 70rpx;
+          height: 70rpx;
+          margin-bottom: 20rpx;
+        }
+        .num-badge {
+          position: absolute;
+          top: -15rpx;
+          right: -12rpx;
+          color: #eb2444;
+          border: 3rpx solid #eb2444;
+          border-radius: 50rpx;
+          background: #fff;
+          min-width: 30rpx;
+          height: 30rpx;
+          line-height: 30rpx;
+          text-align: center;
+          padding: 2rpx;
+          display: block;
+        }
+      }
+    }
+  }
+  .my-menu {
+    background-color: #fff;
+    margin-top: 20rpx;
+    .memu-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 100rpx;
+      border-bottom: 2rpx solid #f7f7f7;
+      padding: 0 30rpx;
+      &:nth-child(1) {
+        border-top: 2rpx solid #f7f7f7;
+      }
+      &:last-child {
+        border-bottom: none;
+      }
+      text {
+        font-size: 28rpx;
+      }
+      image {
+        width: 50rpx;
+        height: 50rpx;
+        margin-right: 20rpx;
+      }
+      .i-name {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+}
+.arrowhead {
+  width: 15rpx;
+  height: 15rpx;
+  border-top: 2rpx solid #999;
+  border-right: 2rpx solid #999;
+  transform: rotate(45deg);
+  margin-left: 10rpx;
+}
+.prod-col {
+  margin-top: 20rpx;
+  background: #fff;
+  display: flex;
+  justify-content: space-around;
+  padding: 30rpx 0 10rpx 0;
+  font-size: 12px;
+  .col-item {
+    text-align: center;
+    .num {
+      font-size: 16px;
+      font-weight: 700;
+      color: #3a86b9;
+    }
+    .tit {
+      line-height: 34px;
+    }
+  }
+}
+.log-out {
+  padding: 20rpx;
+  text-align: center;
+  margin-top: 20rpx;
+}
+.log-out-n {
+  font-size: 30rpx;
+  margin: auto;
+  width: 200rpx;
+  padding: 20rpx;
+  border-radius: 10rpx;
+  background: #e43130;
+  color: #ffffff;
+}
+button.memu-btn.memu-item {
+  background-color: #fff;
+  &:after {
+    border: 0;
+  }
+}
diff --git a/src/pages/member-info/member-info.vue b/src/pages/member-info/member-info.vue
new file mode 100644
index 0000000..4d97660
--- /dev/null
+++ b/src/pages/member-info/member-info.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+    3123123
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+  @use './member-info.scss';
+</style>
diff --git a/src/pages/member/member.scss b/src/pages/member/member.scss
new file mode 100644
index 0000000..3762352
--- /dev/null
+++ b/src/pages/member/member.scss
@@ -0,0 +1,125 @@
+.container {
+  background: #f4f4f4;
+}.price {
+				font-size: 30rpx;
+				color: #ff3000;
+				font-weight: 600;
+
+			/* 	&::before {
+					content: '￥';
+					font-size: 24rpx;
+				} */
+			}
+
+			.origin-price {
+				font-size: 26rpx;
+				font-weight: 400;
+				text-decoration: line-through;
+				color: #c4c4c4;
+			}
+.category-tit {
+  width: 100%;
+  white-space: nowrap;
+  position: fixed;
+  top: 0px;
+  z-index: 999;
+  background-color: #fff;
+  border-bottom: 2rpx solid #f4f4f4;
+  font-size: 30rpx;
+  .category-item {
+    display: inline-block;
+    padding: 20rpx 10rpx;
+    margin: 0 20rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+  }
+}
+.prod-item {
+  height: calc(100vh - 100rpx);
+}
+.on {
+  border-bottom: 4rpx solid #e43130;
+  color: #e43130;
+}
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+.empty {
+  margin-top: 200rpx;
+}
+.prod-items {
+  width: 345rpx;
+  display: inline-block;
+  background: #fff;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+  box-shadow: 0rpx 6rpx 8rpx rgba(58,134,185,0.2);
+  &:nth-child(2n-1) {
+    margin: 20rpx 10rpx 10rpx 20rpx;
+  }
+  &:nth-child(2n) {
+    margin: 20rpx 20rpx 10rpx 10rpx;
+  }
+  .hot-imagecont {
+    .hotsaleimg {
+      width: 341rpx;
+      height: 341rpx;
+    }
+    font-size: 0;
+    text-align: center;
+  }
+  .hot-text {
+    .hotprod-text {
+      font-size: 28rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    margin-top: 20rpx;
+    padding: 0 10rpx;
+    .prod-info {
+      font-size: 22rpx;
+      color: #999;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .prod-text-info {
+      position: relative;
+      height: 70rpx;
+      line-height: 70rpx;
+      font-family: Arial;
+      .hotprod-price {
+        display: inline;
+        font-size: 26rpx;
+        color: #eb2444;
+      }
+      .basket-img {
+        width: 50rpx;
+        height: 50rpx;
+        position: absolute;
+        right: 0;
+        bottom: 7rpx;
+        padding: 8rpx;
+      }
+    }
+  }
+}
+.more-prod {
+  .prod-text-right {
+    .prod-info {
+      font-size: 22rpx;
+      color: #999;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+.empty-wrap {
+  color: #aaa;
+  text-align: center;
+  padding-top: 400rpx;
+}
diff --git a/src/pages/member/member.vue b/src/pages/member/member.vue
new file mode 100644
index 0000000..5f5ca4b
--- /dev/null
+++ b/src/pages/member/member.vue
@@ -0,0 +1,110 @@
+<template>
+  <!-- 商品列表 -->
+    <view class="prod-item">
+      <block v-if="prodList.length">
+        <block v-for="(prod, key) in prodList" :key="key">
+          <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
+            <view class="hot-imagecont">
+              <image :src="prod.pic" class="hotsaleimg" />
+            </view>
+            <view class="hot-text">
+              <view class="hotprod-text">
+                {{ prod.prodName }}
+              </view>
+              <view class="prod-info">
+                {{ prod.brief }}
+              </view>
+              <view class="prod-text-info">
+                <view class="price">
+                  <text class="symbol">
+                    ￥
+                  </text>
+                  <text class="big-num">
+                    {{ wxs.parsePrice(prod.price)[0] }}
+                  </text>
+                  <text class="small-num">
+                    .{{ wxs.parsePrice(prod.price)[1] }}
+                  </text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </block>
+      <view v-else class="empty-wrap">
+        暂无商品数据~
+      </view>
+    </view>
+
+</template>
+
+<script setup>
+  const wxs = number()
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad((options) => {
+    getProdList()
+  })
+
+  const current = ref(1)
+  const pages = ref(0)
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom(() => {
+    if (current.value < pages.value) {
+      current.value = current.value + 1
+      getProdList()
+    }
+  })
+
+  const intoView = ref('')
+  const subCategoryList = ref([])
+
+  const prodList = ref([])
+  const isLoaded = ref(false) // 列表是否加载完毕
+  /**
+   * 根据分类id获取商品列表数据
+   */
+  const getProdList = () => {
+    isLoaded.value = false
+
+    http.request({
+        url: '/prod/prodListByMember',
+        method: 'GET',
+        data: {
+          current: current.value,
+          size: 10,
+          sort: 0,
+          isAllProdType: true
+        }
+      })
+      .then(({
+        data
+      }) => {
+        isLoaded.value = true
+        prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
+        current.value = data.current
+        pages.value = data.pages
+      })
+  }
+
+
+  /**
+   * 跳转商品下详情
+   */
+  const toProdPage = (e) => {
+    const prodid = e.currentTarget.dataset.prodid
+    if (prodid) {
+      uni.navigateTo({
+        url: '/pages/prod/prod?prodid=' + prodid
+      })
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @use './member.scss';
+</style>
diff --git a/src/pages/order-detail/order-detail.vue b/src/pages/order-detail/order-detail.vue
index 2c48514..3623bbf 100644
--- a/src/pages/order-detail/order-detail.vue
+++ b/src/pages/order-detail/order-detail.vue
@@ -50,7 +50,10 @@
                 </text>
               </view>
               <view class="price-nums clearfix">
-                <text class="prodprice">
+
+
+                <text class="prodprice" v-if="item.productType !=2 ">
+
                   <text class="symbol">
                     ￥
                   </text>
@@ -61,6 +64,20 @@
                     .{{ wxs.parsePrice(item.price)[1] }}
                   </text>
                 </text>
+                <text class="prodprice" v-if="item.productType ==2 ">
+
+                  <text class="symbol">
+
+                  </text>
+                  <text class="big-num">
+                    {{ item.payScore }}
+                  </text>
+                  <text class="small-num">
+                    积分
+                  </text>
+                </text>
+
+
                 <view class="btn-box" />
               </view>
             </view>
@@ -172,6 +189,14 @@
           <view class="item payment">
             <view class="item-txt price">
               实付款：
+              <text v-if="totalScore > 0">
+                 <text class="big-num">
+                    {{totalScore }}
+                 </text>
+                <text class="small-num">
+                 积分+
+                </text>
+              </text>
               <text class="symbol">
                 ￥
               </text>
@@ -234,7 +259,7 @@ const userAddrDto = ref(null)
 const orderNumber = ref('')
 const createTime = ref('')
 const total = ref(0) // 商品总额
-/**
+const totalScore =ref(0)/**
  * 加载订单数据
  */
 const loadOrderDetail = (orderNum) => {
@@ -257,6 +282,7 @@ const loadOrderDetail = (orderNum) => {
       transfee.value = data.transfee
       reduceAmount.value = data.reduceAmount
       total.value = data.total
+      totalScore.value = data.actualTotalScore
       uni.hideLoading()
     })
 }
diff --git a/src/pages/prod/prod.vue b/src/pages/prod/prod.vue
index 576998e..65dd02f 100644
--- a/src/pages/prod/prod.vue
+++ b/src/pages/prod/prod.vue
@@ -2,18 +2,9 @@
   <!-- 商品详情 -->
   <view class="container">
     <!-- 轮播图 -->
-    <swiper
-      :indicator-dots="indicatorDots"
-      :autoplay="autoplay"
-      :indicator-color="indicatorColor"
-      :interval="interval"
-      :duration="duration"
-      :indicator-active-color="indicatorActiveColor"
-    >
-      <block
-        v-for="(item, index) in imgs"
-        :key="index"
-      >
+    <swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :indicator-color="indicatorColor" :interval="interval"
+      :duration="duration" :indicator-active-color="indicatorActiveColor">
+      <block v-for="(item, index) in imgs" :key="index">
         <swiper-item>
           <image :src="item" />
         </swiper-item>
@@ -26,49 +17,42 @@
         <view class="prod-tit">
           {{ prodName }}
         </view>
-        <view
-          class="col"
-          @tap="addOrCannelCollection"
-        >
-          <image
-            v-if="!isCollection"
-            src="@/static/images/icon/prod-col.png"
-          />
-          <image
-            v-if="isCollection"
-            src="@/static/images/icon/prod-col-red.png"
-          />
+        <view class="col" @tap="addOrCannelCollection">
+          <image v-if="!isCollection" src="@/static/images/icon/prod-col.png" />
+          <image v-if="isCollection" src="@/static/images/icon/prod-col-red.png" />
           收藏
         </view>
       </view>
       <view class="sales-p">
         {{ brief }}
       </view>
-      <view class="prod-price">
-        <text
-          v-if="defaultSku && defaultSku.price"
-          class="price"
-        >
+      <view class="prod-price" v-if="productType ==0 || productType==1">
+        <text v-if="defaultSku && defaultSku.price" class="price">
           ￥
           <text class="price-num">
             {{ wxs.parsePrice(defaultSku.price)[0] }}
           </text>
           .{{ wxs.parsePrice(defaultSku.price)[1] }}
         </text>
-        <text
-          v-if="defaultSku && defaultSku.oriPrice"
-          class="ori-price"
-        >
+        <text v-if="defaultSku && defaultSku.oriPrice" class="ori-price">
           ￥{{ wxs.parsePrice(defaultSku.oriPrice)[0] }}.{{ wxs.parsePrice(defaultSku.oriPrice)[1] }}
         </text>
         <text class="sales" />
       </view>
+      <view class="prod-price" v-if="productType ==2">
+        <text class="price">
+          <text class="price-num">
+            {{payScore }}
+          </text>
+          积分
+        </text>
+
+        <text class="sales" />
+      </view>
+
     </view>
     <!-- 已选规格 -->
-    <view
-      class="sku"
-      @tap="showSku"
-    >
+    <view class="sku" @tap="showSku">
       <view class="sku-tit">
         已选
       </view>
@@ -81,10 +65,7 @@
     </view>
     <!-- 评价 -->
     <view class="cmt-wrap">
-      <view
-        class="cmt-tit"
-        @tap="showComment"
-      >
+      <view class="cmt-tit" @tap="showComment">
         <view class="cmt-t">
           评价
           <text class="cmt-good">
@@ -97,10 +78,7 @@
         </view>
       </view>
       <view class="cmt-cont">
-        <view
-          class="cmt-tag"
-          @tap="showComment"
-        >
+        <view class="cmt-tag" @tap="showComment">
           <text>全部({{ prodCommData.number }})</text>
           <text>好评({{ prodCommData.praiseNumber }})</text>
           <text>中评({{ prodCommData.secondaryNumber }})</text>
@@ -108,20 +86,13 @@
           <text>有图({{ prodCommData.picNumber }})</text>
         </view>
         <view class="cmt-items">
-          <view
-            v-for="(item, index) in littleCommPage"
-            :key="index"
-            class="cmt-item"
-          >
+          <view v-for="(item, index) in littleCommPage" :key="index" class="cmt-item">
             <view class="cmt-user">
               <text class="date">
                 {{ item.recTime }}
               </text>
               <view class="cmt-user-info">
-                <image
-                  class="user-img"
-                  :src="item.pic"
-                />
+                <image class="user-img" :src="item.pic" />
                 <view class="nickname">
                   {{ item.nickName }}
                 </view>
@@ -130,23 +101,12 @@
             <view class="cmt-cnt">
               {{ item.content }}
             </view>
-            <scroll-view
-              v-if="item.pics.length"
-              class="cmt-attr"
-              scroll-x="true"
-            >
-              <image
-                v-for="(commPic, index2) in item.pics"
-                :key="index2"
-                :src="commPic"
-              />
+            <scroll-view v-if="item.pics.length" class="cmt-attr" scroll-x="true">
+              <image v-for="(commPic, index2) in item.pics" :key="index2" :src="commPic" />
             </scroll-view>
           </view>
         </view>
-        <view
-          v-if="prodCommPage.records.length > 2"
-          class="cmt-more-v"
-        >
+        <view v-if="prodCommPage.records.length > 2" class="cmt-more-v">
           <text @tap="showComment">
             查看全部评价
           </text>
@@ -163,98 +123,62 @@
 
     <!-- 底部按钮 -->
     <view class="cart-footer">
-      <view
-        class="btn icon"
-        @tap="toHomePage"
-      >
+      <view class="btn icon" @tap="toHomePage">
         <image src="@/static/images/tabbar/homepage.png" />
         首页
       </view>
-      <view
-        class="btn icon"
-        @tap="toCartPage"
-      >
+      <view class="btn icon" @tap="toCartPage">
         <image src="@/static/images/tabbar/basket.png" />
         购物车
-        <view
-          v-if="totalCartNum>0"
-          class="badge badge-1"
-        >
+        <view v-if="totalCartNum>0" class="badge badge-1">
           {{ totalCartNum }}
         </view>
       </view>
-      <view
-        class="btn cart"
-        @tap="showSku"
-      >
+      <view class="btn cart" @tap="showSku">
         <text>加入购物车</text>
       </view>
-      <view
-        class="btn buy"
-        @tap="showSku"
-      >
+      <view class="btn buy" @tap="showSku">
         <text>立即购买</text>
       </view>
     </view>
     <!-- end 底部按钮 -->
 
     <!-- 规格弹窗 -->
-    <view
-      v-if="skuShow"
-      class="pup-sku"
-    >
+    <view v-if="skuShow" class="pup-sku">
       <view class="pup-sku-main">
         <view class="pup-sku-header">
-          <image
-            class="pup-sku-img"
-            :src="defaultSku.pic?defaultSku.pic:pic"
-          />
-          <view class="pup-sku-price">
+          <image class="pup-sku-img" :src="defaultSku.pic?defaultSku.pic:pic" />
+          <view class="pup-sku-price" v-if="productType != 2">
             ￥
-            <text
-              v-if="defaultSku && defaultSku.price"
-              class="pup-sku-price-int"
-            >
+            <text v-if="defaultSku && defaultSku.price" class="pup-sku-price-int">
               {{ wxs.parsePrice(defaultSku.price)[0] }}
             </text>
             .{{ wxs.parsePrice(defaultSku.price)[1] }}
           </view>
+          <view class="pup-sku-price" v-if="productType == 2">
+            <text v-if="defaultSku && defaultSku.price" class="pup-sku-price-int">
+              {{payScore}}
+            </text>
+            积分
+          </view>
           <view class="pup-sku-prop">
             <text>已选</text>
             {{ selectedProp.length > 0 ? selectedProp + '，' : '' }}{{ prodNum }}件
           </view>
-          <view
-            class="close"
-            @tap="closePopup"
-          />
+          <view class="close" @tap="closePopup" />
         </view>
         <view class="pup-sku-body">
           <view class="pup-sku-area">
-            <view
-              v-if="skuList.length"
-              class="sku-box"
-            >
-              <block
-                v-for="(skuGroupItem, skuGroupItemIndex) in skuGroupList"
-                :key="skuGroupItemIndex"
-              >
-                <view
-                  v-for="(skuLine, key) in skuGroupItem"
-                  :key="key"
-                  class="items sku-text"
-                >
+            <view v-if="skuList.length" class="sku-box">
+              <block v-for="(skuGroupItem, skuGroupItemIndex) in skuGroupList" :key="skuGroupItemIndex">
+                <view v-for="(skuLine, key) in skuGroupItem" :key="key" class="items sku-text">
                   <text class="sku-kind">
                     {{ key }}
                   </text>
                   <view class="con">
-                    <text
-                      v-for="skuLineItem in skuLine"
-                      :key="skuLineItem"
-                      class="sku-choose-item"
+                    <text v-for="skuLineItem in skuLine" :key="skuLineItem" class="sku-choose-item"
                       :class="[selectedPropList.indexOf(key + ':' + skuLineItem) !== -1?'active':'',
-                               isSkuLineItemNotOptional(allProperties,selectedPropObj,key,skuLineItem,propKeys)? 'dashed' : '']"
-                      @click="toChooseItem(skuGroupItemIndex, skuLineItem, key)"
-                    >
+                               isSkuLineItemNotOptional(allProperties,selectedPropObj,key,skuLineItem,propKeys)? 'dashed' : '']" @click="toChooseItem(skuGroupItemIndex, skuLineItem, key)">
                       {{ skuLineItem }}
                     </text>
                   </view>
@@ -264,23 +188,13 @@
           </view>
           <view class="pup-sku-count">
             <view class="num-wrap">
-              <view
-                class="minus"
-                @tap="onCountMinus"
-              >
+              <view class="minus" @tap="onCountMinus">
                 <text class="row" />
               </view>
               <view class="text-wrap">
-                <input
-                  type="number"
-                  :value="prodNum"
-                  disabled
-                >
+                <input type="number" :value="prodNum" disabled>
               </view>
-              <view
-                class="plus"
-                @tap="onCountPlus"
-              >
+              <view class="plus" @tap="onCountPlus">
                 <text class="row" />
                 <text class="col" />
               </view>
@@ -291,16 +205,10 @@
           </view>
         </view>
         <view class="pup-sku-footer">
-          <view
-            class="btn cart"
-            @tap="addToCart"
-          >
+          <view class="btn cart" @tap="addToCart">
             加入购物车
           </view>
-          <view
-            class="btn buy"
-            @tap="buyNow"
-          >
+          <view class="btn buy" @tap="buyNow">
             立即购买
           </view>
         </view>
@@ -308,10 +216,7 @@
     </view>
 
     <!-- 评价弹窗 -->
-    <view
-      v-if="commentShow"
-      class="cmt-popup"
-    >
+    <view v-if="commentShow" class="cmt-popup">
       <view class="cmt-tit">
         <view class="cmt-t">
           商品评价
@@ -319,65 +224,35 @@
             好评度{{ prodCommData.positiveRating }}%
           </text>
         </view>
-        <text
-          class="close"
-          @tap="closePopup"
-        />
+        <text class="close" @tap="closePopup" />
       </view>
       <view class="cmt-cont">
         <view class="cmt-tag">
-          <text
-            data-evaluate="-1"
-            :class="evaluate==-1?'selected':''"
-            @tap="getProdCommPage"
-          >
+          <text data-evaluate="-1" :class="evaluate==-1?'selected':''" @tap="getProdCommPage">
             全部({{ prodCommData.number }})
           </text>
-          <text
-            data-evaluate="0"
-            :class="evaluate==0?'selected':''"
-            @tap="getProdCommPage"
-          >
+          <text data-evaluate="0" :class="evaluate==0?'selected':''" @tap="getProdCommPage">
             好评({{ prodCommData.praiseNumber }})
           </text>
-          <text
-            data-evaluate="1"
-            :class="evaluate==1?'selected':''"
-            @tap="getProdCommPage"
-          >
+          <text data-evaluate="1" :class="evaluate==1?'selected':''" @tap="getProdCommPage">
             中评({{ prodCommData.secondaryNumber }})
           </text>
-          <text
-            data-evaluate="2"
-            :class="evaluate==2?'selected':''"
-            @tap="getProdCommPage"
-          >
+          <text data-evaluate="2" :class="evaluate==2?'selected':''" @tap="getProdCommPage">
             差评({{ prodCommData.negativeNumber }})
           </text>
-          <text
-            data-evaluate="3"
-            :class="evaluate==3?'selected':''"
-            @tap="getProdCommPage"
-          >
+          <text data-evaluate="3" :class="evaluate==3?'selected':''" @tap="getProdCommPage">
             有图({{ prodCommData.picNumber }})
           </text>
         </view>
         <view class="cmt-items">
           <block v-if="prodCommPage.records.length">
-            <view
-              v-for="(item, index) in prodCommPage.records"
-              :key="index"
-              class="cmt-item"
-            >
+            <view v-for="(item, index) in prodCommPage.records" :key="index" class="cmt-item">
               <view class="cmt-user">
                 <text class="date">
                   {{ item.recTime }}
                 </text>
                 <view class="cmt-user-info">
-                  <image
-                    class="user-img"
-                    :src="item.pic"
-                  />
+                  <image class="user-img" :src="item.pic" />
                   <view class="nickname">
                     {{ item.nickName }}
                   </view>
@@ -386,21 +261,10 @@
               <view class="cmt-cnt">
                 {{ item.content }}
               </view>
-              <scroll-view
-                v-if="item.pics.length"
-                class="cmt-attr"
-                scroll-x="true"
-              >
-                <image
-                  v-for="(commPic, index2) in item.pics"
-                  :key="index2"
-                  :src="commPic"
-                />
+              <scroll-view v-if="item.pics.length" class="cmt-attr" scroll-x="true">
+                <image v-for="(commPic, index2) in item.pics" :key="index2" :src="commPic" />
               </scroll-view>
-              <view
-                v-if="item.replyContent"
-                class="cmt-reply"
-              >
+              <view v-if="item.replyContent" class="cmt-reply">
                 <text class="reply-tit">
                   店铺回复：
                 </text>
@@ -408,17 +272,11 @@
               </view>
             </view>
           </block>
-          <view
-            v-if="!prodCommPage.records.length"
-            class="empty"
-          >
+          <view v-if="!prodCommPage.records.length" class="empty">
             暂无评价
           </view>
         </view>
-        <view
-          v-if="prodCommPage.pages > prodCommPage.current"
-          class="load-more"
-        >
+        <view v-if="prodCommPage.pages > prodCommPage.current" class="load-more">
           <text @tap="getMoreCommPage">
             点击加载更多
           </text>
@@ -429,447 +287,461 @@
 </template>
 
 <script setup>
-const wxs = number()
-
-const indicatorDots = ref(true)
-const indicatorColor = ref('#f2f2f2')
-const indicatorActiveColor = ref('#eb2444')
-const autoplay = ref(true)
-const interval = ref(3000)
-const duration = ref(1000)
-const selectedProp = ref([])
-let prodId = 0
-/**
- * 生命周期函数--监听页面加载
- */
-onLoad((options) => {
-  prodId = options.prodid// 加载商品信息
-  getProdInfo() // 加载商品数据
-  getProdCommData() // 加载评论项
-  getLittleProdComm() // 查看用户是否关注
-  getCollection()
-})
-
-const app = getApp()
-const totalCartNum = ref(0)
-/**
- * 生命周期函数--监听页面显示
- */
-onShow(() => {
-  totalCartNum.value = app.globalData.totalCartCount
-})
-
-/**
- * 分享设置
- */
-onShareAppMessage(() => {
-  return {
-    title: prodName.value,
-    path: '/pages/prod/prod?prodid=' + prodId
-  }
-})
-
-const isCollection = ref(false)
-/**
- * 获取是否关注信息
- */
-const getCollection = () => {
-  uni.showLoading()
-  http.request({
-    url: '/p/user/collection/isCollection',
-    method: 'GET',
-    data: {
-      prodId
-    }
-  })
-    .then(({ data }) => {
-      isCollection.value = data
-      uni.hideLoading()
-    })
-}
-
-/**
- * 添加或者取消收藏商品
- */
-const addOrCannelCollection = () => {
-  uni.showLoading()
-  http.request({
-    url: '/p/user/collection/addOrCancel',
-    method: 'POST',
-    data: prodId
+  const wxs = number()
+
+  const indicatorDots = ref(true)
+  const indicatorColor = ref('#f2f2f2')
+  const indicatorActiveColor = ref('#eb2444')
+  const autoplay = ref(true)
+  const interval = ref(3000)
+  const duration = ref(1000)
+  const selectedProp = ref([])
+  let prodId = 0
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad((options) => {
+    prodId = options.prodid // 加载商品信息
+    getProdInfo() // 加载商品数据
+    getProdCommData() // 加载评论项
+    getLittleProdComm() // 查看用户是否关注
+    getCollection()
   })
-    .then(() => {
-      isCollection.value = !isCollection.value
-      uni.hideLoading()
-    })
-}
-
-const skuList = ref([])
-const brief = ref('')
-const prodNum = ref(1)
-const pic = ref('')
-const imgs = ref('')
-const prodName = ref('')
-const price = ref(0)
-const content = ref('')
-/**
- * 获取商品信息
- */
-const getProdInfo = () => {
-  uni.showLoading()
-  http.request({
-    url: '/prod/prodInfo',
-    method: 'GET',
-    data: {
-      prodId // userType: 0
-    }
+
+  const app = getApp()
+  const totalCartNum = ref(0)
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(() => {
+    totalCartNum.value = app.globalData.totalCartCount
   })
-    .then(({ data }) => {
-      uni.hideLoading()
-      if (!data) {
-        setTimeout(() => {
-          uni.navigateBack()
-        }, 1000)
-        return
-      }
-      imgs.value = data.imgs?.split(',')
-      content.value = util.formatHtml(data.content)
-      price.value = data.price
-      prodName.value = data.prodName
-      prodId = data.prodId
-      brief.value = data.brief
-      skuList.value = data.skuList
-      pic.value = data.pic
-      // 组装sku
-      groupSkuProp(data.skuList, data.price)
-      uni.hideLoading()
-    })
-}
-
-const prodCommData = ref({})
-const getProdCommData = () => {
-  http.request({
-    url: '/prodComm/prodCommData',
-    method: 'GET',
-    data: {
-      prodId
+
+  /**
+   * 分享设置
+   */
+  onShareAppMessage(() => {
+    return {
+      title: prodName.value,
+      path: '/pages/prod/prod?prodid=' + prodId
     }
   })
-    .then(({ data }) => {
-      prodCommData.value = data
-    })
-}
-
-const prodCommPage = ref({
-  current: 0,
-  pages: 0,
-  records: []
-})
-/**
- * 获取部分评论
- */
-const getLittleProdComm = () => {
-  if (prodCommPage.value.records.length) {
-    return
+
+  const isCollection = ref(false)
+  /**
+   * 获取是否关注信息
+   */
+  const getCollection = () => {
+    uni.showLoading()
+    http.request({
+        url: '/p/user/collection/isCollection',
+        method: 'GET',
+        data: {
+          prodId
+        }
+      })
+      .then(({
+        data
+      }) => {
+        isCollection.value = data
+        uni.hideLoading()
+      })
+  }
+
+  /**
+   * 添加或者取消收藏商品
+   */
+  const addOrCannelCollection = () => {
+    uni.showLoading()
+    http.request({
+        url: '/p/user/collection/addOrCancel',
+        method: 'POST',
+        data: prodId
+      })
+      .then(() => {
+        isCollection.value = !isCollection.value
+        uni.hideLoading()
+      })
+  }
+
+  const skuList = ref([])
+  const brief = ref('')
+  const prodNum = ref(1)
+  const pic = ref('')
+  const imgs = ref('')
+  const prodName = ref('')
+  const price = ref(0)
+  const content = ref('')
+  let payScore = 1000
+  let giveScore = 0
+  const productType = ref(0)
+  /**
+   * 获取商品信息
+   */
+  const getProdInfo = () => {
+    uni.showLoading()
+    http.request({
+        url: '/prod/prodInfo',
+        method: 'GET',
+        data: {
+          prodId // userType: 0
+        }
+      })
+      .then(({
+        data
+      }) => {
+        uni.hideLoading()
+        if (!data) {
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1000)
+          return
+        }
+        imgs.value = data.imgs?.split(',')
+        content.value = util.formatHtml(data.content)
+        price.value = data.price
+        prodName.value = data.prodName
+        prodId = data.prodId
+        brief.value = data.brief
+        skuList.value = data.skuList
+        pic.value = data.pic
+        productType.value = data.productType
+        payScore = data.payScore
+        giveScore = data.giveScore
+        // 组装sku
+        groupSkuProp(data.skuList, data.price)
+        uni.hideLoading()
+      })
+  }
+
+  const prodCommData = ref({})
+  const getProdCommData = () => {
+    http.request({
+        url: '/prodComm/prodCommData',
+        method: 'GET',
+        data: {
+          prodId
+        }
+      })
+      .then(({
+        data
+      }) => {
+        prodCommData.value = data
+      })
   }
-  getProdCommPage()
-}
-
-const getMoreCommPage = () => {
-  getProdCommPage()
-}
-
-const littleCommPage = ref([])
-const evaluate = ref(-1)
-/**
- * 获取分页获取评论
- */
-const getProdCommPage = (e) => {
-  if (e) {
-    if (e.currentTarget.dataset.evaluate === evaluate.value) {
+
+  const prodCommPage = ref({
+    current: 0,
+    pages: 0,
+    records: []
+  })
+  /**
+   * 获取部分评论
+   */
+  const getLittleProdComm = () => {
+    if (prodCommPage.value.records.length) {
       return
     }
-    prodCommPage.value = {
-      current: 0,
-      pages: 0,
-      records: []
-    }
-    evaluate.value = e.currentTarget.dataset.evaluate
+    getProdCommPage()
   }
 
-  http.request({
-    url: '/prodComm/prodCommPageByProd',
-    method: 'GET',
-    data: {
-      prodId,
-      size: 10,
-      current: prodCommPage.value.current + 1,
-      evaluate: evaluate.value
+  const getMoreCommPage = () => {
+    getProdCommPage()
+  }
+
+  const littleCommPage = ref([])
+  const evaluate = ref(-1)
+  /**
+   * 获取分页获取评论
+   */
+  const getProdCommPage = (e) => {
+    if (e) {
+      if (e.currentTarget.dataset.evaluate === evaluate.value) {
+        return
+      }
+      prodCommPage.value = {
+        current: 0,
+        pages: 0,
+        records: []
+      }
+      evaluate.value = e.currentTarget.dataset.evaluate
     }
-  })
-    .then(({ data }) => {
-      data.records.forEach(item => {
-        if (item.pics) {
-          item.pics = item.pics.split(',')
+
+    http.request({
+        url: '/prodComm/prodCommPageByProd',
+        method: 'GET',
+        data: {
+          prodId,
+          size: 10,
+          current: prodCommPage.value.current + 1,
+          evaluate: evaluate.value
+        }
+      })
+      .then(({
+        data
+      }) => {
+        data.records.forEach(item => {
+          if (item.pics) {
+            item.pics = item.pics.split(',')
+          }
+        })
+        let records = prodCommPage.value.records
+        records = records.concat(data.records)
+        // 如果商品详情中没有评论的数据，截取两条到商品详情页商品详情
+        prodCommPage.value = {
+          current: data.current,
+          pages: data.pages,
+          records
+        }
+        if (!littleCommPage.value.length) {
+          littleCommPage.value = records.slice(0, 2)
         }
       })
-      let records = prodCommPage.value.records
-      records = records.concat(data.records)
-      // 如果商品详情中没有评论的数据，截取两条到商品详情页商品详情
-      prodCommPage.value = {
-        current: data.current,
-        pages: data.pages,
-        records
-      }
-      if (!littleCommPage.value.length) {
-        littleCommPage.value = records.slice(0, 2)
-      }
-    })
-}
-let selectedPropObjList = null
-const skuGroup = ref({})
-const defaultSku = ref(null)
-const selectedPropObj = ref({})
-const propKeys = ref([])
-const allProperties = ref([])
-const findSku = ref(true)
-const skuGroupList = ref([])
-/**
- * 组装SKU
- */
-const groupSkuProp = (skuList, defaultPrice) => {
-  if (skuList.length === 1 && !skuList[0].properties) {
-    defaultSku.value = skuList[0]
-    findSku.value = true
-    return
   }
-  const _skuGroupList = []
-  const skuGroupParam = {}
-  const _allProperties = []
-  const _propKeys = []
-  const _selectedPropObj = {}
-  const selectedPropObjListParam = []
-
-  let defaultSkuParam = null
-  for (let i = 0; i < skuList.length; i++) {
-    let isDefault = false
-    if (!defaultSkuParam && skuList[i].price == defaultPrice) {
-      defaultSkuParam = skuList[i]
-      isDefault = true
+  let selectedPropObjList = null
+  const skuGroup = ref({})
+  const defaultSku = ref(null)
+  const selectedPropObj = ref({})
+  const propKeys = ref([])
+  const allProperties = ref([])
+  const findSku = ref(true)
+  const skuGroupList = ref([])
+  /**
+   * 组装SKU
+   */
+  const groupSkuProp = (skuList, defaultPrice) => {
+    if (skuList.length === 1 && !skuList[0].properties) {
+      defaultSku.value = skuList[0]
+      findSku.value = true
+      return
     }
-    const properties = skuList[i].properties // 版本:公开版;颜色:金色;内存:64GB
-    _allProperties.push(properties)
-    const propList = properties.split(';') // ["版本:公开版","颜色:金色","内存:64GB"]
-    for (let j = 0; j < propList.length; j++) {
-      const propval = propList[j].split(':') // ["版本","公开版"]
-      let props = skuGroupParam[propval[0]] // 先取出 版本对应的值数组
-      // 如果当前是默认选中的sku，把对应的属性值 组装到selectedProp
-      if (isDefault) {
-        _propKeys.push(propval[0])
-        _selectedPropObj[propval[0]] = propval[1]
-        const selectedPropObjItem = {}
-        selectedPropObjItem[propval[0]] = propval[1]
-        selectedPropObjListParam.push(selectedPropObjItem)
+    const _skuGroupList = []
+    const skuGroupParam = {}
+    const _allProperties = []
+    const _propKeys = []
+    const _selectedPropObj = {}
+    const selectedPropObjListParam = []
+
+    let defaultSkuParam = null
+    for (let i = 0; i < skuList.length; i++) {
+      let isDefault = false
+      if (!defaultSkuParam && skuList[i].price == defaultPrice) {
+        defaultSkuParam = skuList[i]
+        isDefault = true
       }
-      if (!props) {
-        props = [] // 假设还没有版本，新建个新的空数组
-        props.push(propval[1]) // 把 "公开版" 放进空数组
-      } else {
-        if (props.indexOf(propval[1]) === -1) { // 如果数组里面没有"公开版"
-          props.push(propval[1]) // 把 "公开版" 放进数组
+      const properties = skuList[i].properties // 版本:公开版;颜色:金色;内存:64GB
+      _allProperties.push(properties)
+      const propList = properties.split(';') // ["版本:公开版","颜色:金色","内存:64GB"]
+      for (let j = 0; j < propList.length; j++) {
+        const propval = propList[j].split(':') // ["版本","公开版"]
+        let props = skuGroupParam[propval[0]] // 先取出 版本对应的值数组
+        // 如果当前是默认选中的sku，把对应的属性值 组装到selectedProp
+        if (isDefault) {
+          _propKeys.push(propval[0])
+          _selectedPropObj[propval[0]] = propval[1]
+          const selectedPropObjItem = {}
+          selectedPropObjItem[propval[0]] = propval[1]
+          selectedPropObjListParam.push(selectedPropObjItem)
+        }
+        if (!props) {
+          props = [] // 假设还没有版本，新建个新的空数组
+          props.push(propval[1]) // 把 "公开版" 放进空数组
+        } else {
+          if (props.indexOf(propval[1]) === -1) { // 如果数组里面没有"公开版"
+            props.push(propval[1]) // 把 "公开版" 放进数组
+          }
         }
+        skuGroupParam[propval[0]] = props // 最后把数据 放回版本对应的值
+        const propListItem = {}
+        propListItem[propval[0]] = props
+        _skuGroupList.push(propListItem)
       }
-      skuGroupParam[propval[0]] = props // 最后把数据 放回版本对应的值
-      const propListItem = {}
-      propListItem[propval[0]] = props
-      _skuGroupList.push(propListItem)
     }
+    defaultSku.value = defaultSkuParam
+    propKeys.value = _propKeys
+    selectedPropObj.value = _selectedPropObj
+    skuGroup.value = skuGroupParam
+    selectedPropObjList = selectedPropObjListParam
+    skuGroupList.value = unique(_skuGroupList)
+    allProperties.value = _allProperties
+    parseSelectedObjToVals(skuList)
   }
-  defaultSku.value = defaultSkuParam
-  propKeys.value = _propKeys
-  selectedPropObj.value = _selectedPropObj
-  skuGroup.value = skuGroupParam
-  selectedPropObjList = selectedPropObjListParam
-  skuGroupList.value = unique(_skuGroupList)
-  allProperties.value = _allProperties
-  parseSelectedObjToVals(skuList)
-}
-
-const selectedPropList = ref(null)
-/**
- * 将已选的 {key:val,key2:val2}转换成 [val,val2]
- */
-const parseSelectedObjToVals = (skuList) => {
-  const selectedPropObjListParam = selectedPropObjList
-  let selectedPropertiesParam = ''
-  const selectedPropListParam = []
-  const selectedPropShowListParam = []
-  for (let i = 0; i < selectedPropObjListParam.length; i++) {
-    const selectedPropObjItem = selectedPropObjListParam[i]
-    for (const key in selectedPropObjItem) {
-      if (Object.hasOwnProperty.call(selectedPropObjItem, key)) {
-        selectedPropListParam.push(key + ':' + selectedPropObjItem[key])
-        selectedPropShowListParam.push(selectedPropObjItem[key])
-        selectedPropertiesParam += key + ':' + selectedPropObjItem[key] + ';'
+
+  const selectedPropList = ref(null)
+  /**
+   * 将已选的 {key:val,key2:val2}转换成 [val,val2]
+   */
+  const parseSelectedObjToVals = (skuList) => {
+    const selectedPropObjListParam = selectedPropObjList
+    let selectedPropertiesParam = ''
+    const selectedPropListParam = []
+    const selectedPropShowListParam = []
+    for (let i = 0; i < selectedPropObjListParam.length; i++) {
+      const selectedPropObjItem = selectedPropObjListParam[i]
+      for (const key in selectedPropObjItem) {
+        if (Object.hasOwnProperty.call(selectedPropObjItem, key)) {
+          selectedPropListParam.push(key + ':' + selectedPropObjItem[key])
+          selectedPropShowListParam.push(selectedPropObjItem[key])
+          selectedPropertiesParam += key + ':' + selectedPropObjItem[key] + ';'
+        }
       }
     }
+    selectedPropertiesParam = selectedPropertiesParam.substring(0, selectedPropertiesParam.length - 1)
+    selectedPropList.value = selectedPropListParam
+    selectedPropObjList = selectedPropObjListParam
+    let findSkuParam = false
+    for (let i = 0; i < skuList.length; i++) {
+      if (skuList[i].properties == selectedPropertiesParam) {
+        findSkuParam = true
+        defaultSku.value = skuList[i]
+        break
+      }
+    }
+    findSku.value = findSkuParam
   }
-  selectedPropertiesParam = selectedPropertiesParam.substring(0, selectedPropertiesParam.length - 1)
-  selectedPropList.value = selectedPropListParam
-  selectedPropObjList = selectedPropObjListParam
-  let findSkuParam = false
-  for (let i = 0; i < skuList.length; i++) {
-    if (skuList[i].properties == selectedPropertiesParam) {
-      findSkuParam = true
-      defaultSku.value = skuList[i]
-      break
+
+  /**
+   * 判断当前的规格值 是否可以选
+   */
+  const isSkuLineItemNotOptional = (allProperties, selectedPropObjParam, key, item, propKeys) => {
+    const selectedPropObj = Object.assign({}, selectedPropObjParam)
+    let properties = ''
+    selectedPropObj[key] = item
+    for (let j = 0; j < propKeys.length; j++) {
+      properties += propKeys[j] + ':' + selectedPropObj[propKeys[j]] + ';'
     }
+    properties = properties.substring(0, properties.length - 1)
+    for (let i = 0; i < allProperties.length; i++) {
+      if (properties == allProperties[i]) {
+        return false
+      }
+    }
+    for (let i = 0; i < allProperties.length; i++) {
+      if (allProperties[i].indexOf(item) >= 0) {
+        return true
+      }
+    }
+    return false
   }
-  findSku.value = findSkuParam
-}
-
-/**
- * 判断当前的规格值 是否可以选
- */
-const isSkuLineItemNotOptional = (allProperties, selectedPropObjParam, key, item, propKeys) => {
-  const selectedPropObj = Object.assign({}, selectedPropObjParam)
-  let properties = ''
-  selectedPropObj[key] = item
-  for (let j = 0; j < propKeys.length; j++) {
-    properties += propKeys[j] + ':' + selectedPropObj[propKeys[j]] + ';'
+
+  /**
+   * 规格点击事件
+   */
+  const toChooseItem = (skuGroupItemIndex, skuLineItem, key) => {
+    selectedPropObjList[skuGroupItemIndex][key] = skuLineItem
+    selectedPropObj.value[key] = skuLineItem
+    parseSelectedObjToVals(skuList.value)
   }
-  properties = properties.substring(0, properties.length - 1)
-  for (let i = 0; i < allProperties.length; i++) {
-    if (properties == allProperties[i]) {
-      return false
-    }
+
+  /**
+   * 去重
+   */
+  const unique = (arr) => {
+    const map = {}
+    arr.forEach(item => {
+      const obj = {}
+      Object.keys(item).sort().map(key => (obj[key] = item[key]))
+      map[JSON.stringify(obj)] = item
+    })
+    return Object.keys(map).map(key => JSON.parse(key))
   }
-  for (let i = 0; i < allProperties.length; i++) {
-    if (allProperties[i].indexOf(item) >= 0) {
-      return true
-    }
+
+  /**
+   * 跳转到首页
+   */
+  const toHomePage = () => {
+    uni.switchTab({
+      url: '/pages/index/index'
+    })
   }
-  return false
-}
-
-/**
- * 规格点击事件
- */
-const toChooseItem = (skuGroupItemIndex, skuLineItem, key) => {
-  selectedPropObjList[skuGroupItemIndex][key] = skuLineItem
-  selectedPropObj.value[key] = skuLineItem
-  parseSelectedObjToVals(skuList.value)
-}
-
-/**
- * 去重
- */
-const unique = (arr) => {
-  const map = {}
-  arr.forEach(item => {
-    const obj = {}
-    Object.keys(item).sort().map(key => (obj[key] = item[key]))
-    map[JSON.stringify(obj)] = item
-  })
-  return Object.keys(map).map(key => JSON.parse(key))
-}
-
-/**
- * 跳转到首页
- */
-const toHomePage = () => {
-  uni.switchTab({
-    url: '/pages/index/index'
-  })
-}
-
-/**
- * 跳转到购物车
- */
-const toCartPage = () => {
-  uni.switchTab({
-    url: '/pages/basket/basket'
-  })
-}
-
-const shopId = 1
-/**
- * 加入购物车
- */
-const addToCart = () => {
-  uni.showLoading({
-    mask: true
-  })
-  http.request({
-    url: '/p/shopCart/changeItem',
-    method: 'POST',
-    data: {
-      basketId: 0,
-      count: prodNum.value,
-      prodId,
-      shopId,
-      skuId: defaultSku.value.skuId
-    }
-  })
-    .then(() => {
-      totalCartNum.value = totalCartNum.value + prodNum.value
-      uni.hideLoading()
-      uni.showToast({
-        title: '加入购物车成功',
-        icon: 'none'
+
+  /**
+   * 跳转到购物车
+   */
+  const toCartPage = () => {
+    uni.switchTab({
+      url: '/pages/basket/basket'
+    })
+  }
+
+  const shopId = 1
+  /**
+   * 加入购物车
+   */
+  const addToCart = () => {
+    uni.showLoading({
+      mask: true
+    })
+    http.request({
+        url: '/p/shopCart/changeItem',
+        method: 'POST',
+        data: {
+          basketId: 0,
+          count: prodNum.value,
+          prodId,
+          shopId,
+          skuId: defaultSku.value.skuId
+        }
       })
+      .then(() => {
+        totalCartNum.value = totalCartNum.value + prodNum.value
+        uni.hideLoading()
+        uni.showToast({
+          title: '加入购物车成功',
+          icon: 'none'
+        })
+      })
+  }
+
+  /**
+   * 立即购买
+   */
+  const buyNow = () => {
+    uni.setStorageSync('orderItem', JSON.stringify({
+      prodId,
+      skuId: defaultSku.value.skuId,
+      prodCount: prodNum.value,
+      shopId
+    }))
+    uni.navigateTo({
+      url: '/pages/submit-order/submit-order?orderEntry=1'
     })
-}
-
-/**
- * 立即购买
- */
-const buyNow = () => {
-  uni.setStorageSync('orderItem', JSON.stringify({
-    prodId,
-    skuId: defaultSku.value.skuId,
-    prodCount: prodNum.value,
-    shopId
-  }))
-  uni.navigateTo({
-    url: '/pages/submit-order/submit-order?orderEntry=1'
-  })
-}
-
-/**
- * 减数量
- */
-const onCountMinus = () => {
-  if (prodNum.value > 1) {
-    prodNum.value = prodNum.value - 1
   }
-}
-
-/**
- * 加数量
- */
-const onCountPlus = () => {
-  if (prodNum.value < 1000) {
-    prodNum.value = prodNum.value + 1
+
+  /**
+   * 减数量
+   */
+  const onCountMinus = () => {
+    if (prodNum.value > 1) {
+      prodNum.value = prodNum.value - 1
+    }
+  }
+
+  /**
+   * 加数量
+   */
+  const onCountPlus = () => {
+    if (prodNum.value < 1000) {
+      prodNum.value = prodNum.value + 1
+    }
+  }
+
+  const skuShow = ref(false)
+  const showSku = () => {
+    skuShow.value = true
+  }
+
+  const commentShow = ref(false)
+  const showComment = () => {
+    commentShow.value = true
+  }
+
+  const closePopup = () => {
+    skuShow.value = false
+    commentShow.value = false
   }
-}
-
-const skuShow = ref(false)
-const showSku = () => {
-  skuShow.value = true
-}
-
-const commentShow = ref(false)
-const showComment = () => {
-  commentShow.value = true
-}
-
-const closePopup = () => {
-  skuShow.value = false
-  commentShow.value = false
-}
 </script>
 
 <style scoped lang="scss">
-@use './prod.scss';
+  @use './prod.scss';
 </style>
diff --git a/src/pages/score/score.scss b/src/pages/score/score.scss
new file mode 100644
index 0000000..020cef0
--- /dev/null
+++ b/src/pages/score/score.scss
@@ -0,0 +1,126 @@
+.container {
+  background: #f4f4f4;
+}
+.price {
+				font-size: 30rpx;
+				color: #ff3000;
+				font-weight: 600;
+
+				/* &::before {
+					content: '￥';
+					font-size: 24rpx;
+				} */
+			}
+
+			.origin-price {
+				font-size: 26rpx;
+				font-weight: 400;
+				text-decoration: line-through;
+				color: #c4c4c4;
+			}
+.category-tit {
+  width: 100%;
+  white-space: nowrap;
+  position: fixed;
+  top: 0px;
+  z-index: 999;
+  background-color: #fff;
+  border-bottom: 2rpx solid #f4f4f4;
+  font-size: 30rpx;
+  .category-item {
+    display: inline-block;
+    padding: 20rpx 10rpx;
+    margin: 0 20rpx;
+    box-sizing: border-box;
+    font-size: 28rpx;
+  }
+}
+.prod-item {
+  height: calc(100vh - 100rpx);
+}
+.on {
+  border-bottom: 4rpx solid #e43130;
+  color: #e43130;
+}
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
+.empty {
+  margin-top: 200rpx;
+}
+.prod-items {
+  width: 345rpx;
+  display: inline-block;
+  background: #fff;
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+  box-shadow: 0rpx 6rpx 8rpx rgba(58,134,185,0.2);
+  &:nth-child(2n-1) {
+    margin: 20rpx 10rpx 10rpx 20rpx;
+  }
+  &:nth-child(2n) {
+    margin: 20rpx 20rpx 10rpx 10rpx;
+  }
+  .hot-imagecont {
+    .hotsaleimg {
+      width: 341rpx;
+      height: 341rpx;
+    }
+    font-size: 0;
+    text-align: center;
+  }
+  .hot-text {
+    .hotprod-text {
+      font-size: 28rpx;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    margin-top: 20rpx;
+    padding: 0 10rpx;
+    .prod-info {
+      font-size: 22rpx;
+      color: #999;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .prod-text-info {
+      position: relative;
+      height: 70rpx;
+      line-height: 70rpx;
+      font-family: Arial;
+      .hotprod-price {
+        display: inline;
+        font-size: 26rpx;
+        color: #eb2444;
+      }
+      .basket-img {
+        width: 50rpx;
+        height: 50rpx;
+        position: absolute;
+        right: 0;
+        bottom: 7rpx;
+        padding: 8rpx;
+      }
+    }
+  }
+}
+.more-prod {
+  .prod-text-right {
+    .prod-info {
+      font-size: 22rpx;
+      color: #999;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+}
+.empty-wrap {
+  color: #aaa;
+  text-align: center;
+  padding-top: 400rpx;
+}
diff --git a/src/pages/score/score.vue b/src/pages/score/score.vue
new file mode 100644
index 0000000..ca7323a
--- /dev/null
+++ b/src/pages/score/score.vue
@@ -0,0 +1,110 @@
+<template>
+  <!-- 商品列表 -->
+    <view class="prod-item">
+      <block v-if="prodList.length">
+        <block v-for="(prod, key) in prodList" :key="key">
+          <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
+            <view class="hot-imagecont">
+              <image :src="prod.pic" class="hotsaleimg" />
+            </view>
+            <view class="hot-text">
+              <view class="hotprod-text">
+                {{ prod.prodName }}
+              </view>
+              <view class="prod-info">
+                {{ prod.brief }}
+              </view>
+              <view class="prod-text-info">
+                <view class="price">
+               
+                  <text class="big-num">
+                    {{ prod.payScore }}
+                  </text>
+    
+                  <text class="symbol">
+                    积分
+                  </text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </block>
+      <view v-else class="empty-wrap">
+        暂无商品数据~
+      </view>
+    </view>
+
+</template>
+
+<script setup>
+  const wxs = number()
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad((options) => {
+
+    getProdList()
+  })
+
+  const current = ref(1)
+  const pages = ref(0)
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom(() => {
+    if (current.value < pages.value) {
+      current.value = current.value + 1
+      getProdList()
+    }
+  })
+
+  const intoView = ref('')
+  const subCategoryList = ref([])
+
+  const prodList = ref([])
+  const isLoaded = ref(false) // 列表是否加载完毕
+  /**
+   * 根据分类id获取商品列表数据
+   */
+  const getProdList = () => {
+    isLoaded.value = false
+
+    http.request({
+        url: '/prod/prodListByScore',
+        method: 'GET',
+        data: {
+          current: current.value,
+          size: 10,
+          sort: 0,
+          isAllProdType: true
+        }
+      })
+      .then(({
+        data
+      }) => {
+        isLoaded.value = true
+        prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
+        current.value = data.current
+        pages.value = data.pages
+      })
+  }
+
+
+  /**
+   * 跳转商品下详情
+   */
+  const toProdPage = (e) => {
+    const prodid = e.currentTarget.dataset.prodid
+    if (prodid) {
+      uni.navigateTo({
+        url: '/pages/prod/prod?prodid=' + prodid
+      })
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @use './score.scss';
+</style>
diff --git a/src/pages/sub-category/sub-category.scss b/src/pages/sub-category/sub-category.scss
index 93a6335..7154126 100644
--- a/src/pages/sub-category/sub-category.scss
+++ b/src/pages/sub-category/sub-category.scss
@@ -1,6 +1,22 @@
 .container {
   background: #f4f4f4;
-}
+}.price {
+				font-size: 30rpx;
+				color: #ff3000;
+				font-weight: 600;
+/* 
+				&::before {
+					content: '￥';
+					font-size: 24rpx;
+				} */
+			}
+
+			.origin-price {
+				font-size: 26rpx;
+				font-weight: 400;
+				text-decoration: line-through;
+				color: #c4c4c4;
+			}
 .category-tit {
   width: 100%;
   white-space: nowrap;
diff --git a/src/pages/sub-category/sub-category.vue b/src/pages/sub-category/sub-category.vue
index fa8ab78..d268a0f 100644
--- a/src/pages/sub-category/sub-category.vue
+++ b/src/pages/sub-category/sub-category.vue
@@ -1,22 +1,10 @@
 <template>
   <view class="Mall4j container">
     <!-- 顶部子分类tab -->
-    <scroll-view
-      scroll-x="true"
-      class="category-tit"
-      :scroll-into-view="intoView"
-      :scroll-with-animation="true"
-    >
-      <block
-        v-for="(item, index) in subCategoryList"
-        :key="index"
-      >
-        <view
-          :id="'sw' + item.categoryId"
-          :class="'category-item ' + (item.categoryId==categoryId? 'on':'')"
-          :data-id="item.categoryId"
-          @tap="onSubCategoryTap"
-        >
+    <scroll-view scroll-x="true" class="category-tit" :scroll-into-view="intoView" :scroll-with-animation="true">
+      <block v-for="(item, index) in subCategoryList" :key="index">
+        <view :id="'sw' + item.categoryId" :class="'category-item ' + (item.categoryId==categoryId? 'on':'')"
+          :data-id="item.categoryId" @tap="onSubCategoryTap">
           {{ item.categoryName }}
         </view>
       </block>
@@ -24,20 +12,10 @@
     <!-- 商品列表 -->
     <view class="prod-item">
       <block v-if="prodList.length">
-        <block
-          v-for="(prod, key) in prodList"
-          :key="key"
-        >
-          <view
-            class="prod-items"
-            :data-prodid="prod.prodId"
-            @tap="toProdPage"
-          >
+        <block v-for="(prod, key) in prodList" :key="key">
+          <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
             <view class="hot-imagecont">
-              <image
-                :src="prod.pic"
-                class="hotsaleimg"
-              />
+              <image :src="prod.pic" class="hotsaleimg" />
             </view>
             <view class="hot-text">
               <view class="hotprod-text">
@@ -63,10 +41,7 @@
           </view>
         </block>
       </block>
-      <view
-        v-else
-        class="empty-wrap"
-      >
+      <view v-else class="empty-wrap">
         暂无商品数据~
       </view>
     </view>
@@ -74,104 +49,108 @@
 </template>
 
 <script setup>
-const wxs = number()
+  const wxs = number()
 
-const parentId = ref('')
-const categoryId = ref(0)
-/**
- * 生命周期函数--监听页面加载
- */
-onLoad((options) => {
-  parentId.value = options.parentId
-  categoryId.value = options.categoryId
-  getSubCategory()
-  getProdList()
-})
-
-const current = ref(1)
-const pages = ref(0)
-/**
- * 页面上拉触底事件的处理函数
- */
-onReachBottom(() => {
-  if (current.value < pages.value) {
-    current.value = current.value + 1
+  const parentId = ref('')
+  const categoryId = ref(0)
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad((options) => {
+    parentId.value = options.parentId
+    categoryId.value = options.categoryId
+    getSubCategory()
     getProdList()
-  }
-})
+  })
 
-const intoView = ref('')
-const subCategoryList = ref([])
-/**
- * 获取顶栏子分类数据
- */
-const getSubCategory = () => {
-  http.request({
-    url: '/category/categoryInfo',
-    method: 'GET',
-    data: {
-      parentId: parentId.value
+  const current = ref(1)
+  const pages = ref(0)
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom(() => {
+    if (current.value < pages.value) {
+      current.value = current.value + 1
+      getProdList()
     }
   })
-    .then(({ data }) => {
-      subCategoryList.value = data
-      nextTick(() => {
-        intoView.value = 'sw' + categoryId.value
+
+  const intoView = ref('')
+  const subCategoryList = ref([])
+  /**
+   * 获取顶栏子分类数据
+   */
+  const getSubCategory = () => {
+    http.request({
+        url: '/category/categoryInfo',
+        method: 'GET',
+        data: {
+          parentId: parentId.value
+        }
       })
-    })
-}
+      .then(({
+        data
+      }) => {
+        subCategoryList.value = data
+        nextTick(() => {
+          intoView.value = 'sw' + categoryId.value
+        })
+      })
+  }
 
-const prodList = ref([])
-const isLoaded = ref(false) // 列表是否加载完毕
-/**
- * 根据分类id获取商品列表数据
- */
-const getProdList = () => {
-  isLoaded.value = false
+  const prodList = ref([])
+  const isLoaded = ref(false) // 列表是否加载完毕
+  /**
+   * 根据分类id获取商品列表数据
+   */
+  const getProdList = () => {
+    isLoaded.value = false
 
-  http.request({
-    url: '/prod/pageProd',
-    method: 'GET',
-    data: {
-      categoryId: categoryId.value,
-      current: current.value,
-      size: 10,
-      sort: 0,
-      isAllProdType: true
-    }
-  })
-    .then(({ data }) => {
-      isLoaded.value = true
-      prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
-      current.value = data.current
-      pages.value = data.pages
-    })
-}
+    http.request({
+        url: '/prod/pageProd',
+        method: 'GET',
+        data: {
+          categoryId: categoryId.value,
+          current: current.value,
+          size: 10,
+          sort: 0,
+          isAllProdType: true
+        }
+      })
+      .then(({
+        data
+      }) => {
+        isLoaded.value = true
+        prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
+        current.value = data.current
+        pages.value = data.pages
+      })
+  }
 
-/**
- * 切换顶部分类
- */
-const onSubCategoryTap = (e) => {
-  categoryId.value = e.currentTarget.dataset.id
-  current.value = 1
-  pages.value = 0
-  intoView.value = 'sw' + e.currentTarget.dataset.id
-  getProdList()
-}
+  /**
+   * 切换顶部分类
+   */
+  const onSubCategoryTap = (e) => {
+    categoryId.value = e.currentTarget.dataset.id
+    current.value = 1
+    pages.value = 0
+    intoView.value = 'sw' + e.currentTarget.dataset.id
+    getProdList()
+  }
 
-/**
- * 跳转商品下详情
- */
-const toProdPage = (e) => {
-  const prodid = e.currentTarget.dataset.prodid
-  if (prodid) {
-    uni.navigateTo({
-      url: '/pages/prod/prod?prodid=' + prodid
-    })
+  /**
+   * 跳转商品下详情
+   */
+  const toProdPage = (e) => {
+    const prodid = e.currentTarget.dataset.prodid
+    if (prodid) {
+      uni.navigateTo({
+        url: '/pages/prod/prod?prodid=' + prodid
+      })
+    }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-@import "./sub-category.scss";
+  @import "./sub-category.scss";
 </style>
diff --git a/src/pages/submit-order/submit-order.vue b/src/pages/submit-order/submit-order.vue
index 166ad64..aff325b 100644
--- a/src/pages/submit-order/submit-order.vue
+++ b/src/pages/submit-order/submit-order.vue
@@ -3,14 +3,8 @@
     <view class="container">
       <view class="submit-order">
         <!-- 收货地址 -->
-        <view
-          class="delivery-addr "
-          @tap="toAddrListPage"
-        >
-          <view
-            v-if="!userAddr"
-            class="addr-bg "
-          >
+        <view class="delivery-addr " @tap="toAddrListPage">
+          <view v-if="!userAddr" class="addr-bg ">
             <view class="add-addr">
               <view class="plus-sign-img">
                 <image src="@/static/images/icon/plus-sign.png" />
@@ -19,10 +13,7 @@
             </view>
             <view class="arrow empty" />
           </view>
-          <view
-            v-if="userAddr"
-            class="addr-bg whole"
-          >
+          <view v-if="userAddr" class="addr-bg whole">
             <view class="addr-icon">
               <image src="@/static/images/icon/addr.png" />
             </view>
@@ -43,15 +34,8 @@
 
         <!-- 商品详情 -->
         <view class="prod-item">
-          <block
-            v-for="(item, index) in orderItems"
-            :key="index"
-          >
-            <view
-              class="item-cont"
-              :data-ordernum="item.primaryOrderNo"
-              @tap="toOrderDetailPage"
-            >
+          <block v-for="(item, index) in orderItems" :key="index">
+            <view class="item-cont" :data-ordernum="item.primaryOrderNo" @tap="toOrderDetailPage">
               <view class="prod-pic">
                 <image :src="item.pic" />
               </view>
@@ -63,7 +47,8 @@
                   {{ item.skuName }}
                 </view>
                 <view class="price-nums">
-                  <text class="prodprice">
+                  <text class="prodprice" v-if="item.productType !=2 ">
+
                     <text class="symbol">
                       ￥
                     </text>
@@ -74,6 +59,18 @@
                       .{{ wxs.parsePrice(item.price)[1] }}
                     </text>
                   </text>
+                  <text class="prodprice" v-if="item.productType ==2 ">
+                  
+                    <text class="symbol">
+                      
+                    </text>
+                    <text class="big-num">
+                      {{ item.payScore }}
+                    </text>
+                    <text class="small-num">
+                      积分
+                    </text>
+                  </text>
                   <text class="prodcount">
                     x{{ item.prodCount }}
                   </text>
@@ -88,6 +85,14 @@
             </text>
             <view class="prodprice">
               合计：
+              <text v-if="totalScore > 0">
+                 <text class="big-num">
+                    {{totalScore }}
+                 </text>
+                <text class="small-num">
+                 积分+
+                </text>
+              </text>
               <text class="symbol">
                 ￥
               </text>
@@ -104,17 +109,11 @@
         <!-- 订单详情 -->
         <view class="order-msg">
           <view class="msg-item">
-            <view
-              class="item coupon"
-              @tap="showCouponPopup"
-            >
+            <view class="item coupon" @tap="showCouponPopup">
               <text class="item-tit">
                 优惠券：
               </text>
-              <text
-                v-if="!coupons.canUseCoupons"
-                class="item-txt"
-              >
+              <text v-if="!coupons.canUseCoupons" class="item-txt">
                 暂无可用
               </text>
               <text class="coupon-btn">
@@ -124,10 +123,7 @@
             </view>
             <view class="item">
               <text>买家留言：</text>
-              <input
-                v-model="remarks"
-                placeholder="给卖家留言"
-              >
+              <input v-model="remarks" placeholder="给卖家留言">
             </view>
           </view>
         </view>
@@ -185,6 +181,14 @@
             <view class="item payment">
               <view class="item-txt price">
                 小计：
+                    <text v-if="totalScore > 0">
+                       <text class="big-num">
+                          {{totalScore }}
+                       </text>
+                      <text class="small-num">
+                       积分+
+                      </text>
+                    </text>
                 <text class="symbol">
                   ￥
                 </text>
@@ -206,6 +210,16 @@
           <view class="item-txt">
             合计：
             <view class="price">
+
+                <text v-if="totalScore > 0">
+
+                   <text class="big-num">
+                      {{totalScore }}
+                   </text>
+                  <text class="small-num">
+                   积分+
+                  </text>
+                </text>
               <text class="symbol">
                 ￥
               </text>
@@ -218,76 +232,41 @@
             </view>
           </view>
         </view>
-        <view
-          class="footer-box"
-          @tap="toPay"
-        >
+        <view class="footer-box" @tap="toPay">
           提交订单
         </view>
       </view>
     </view>
 
     <!-- 选择优惠券弹窗 -->
-    <view
-      v-if="popupShow"
-      class="popup-hide"
-    >
+    <view v-if="popupShow" class="popup-hide">
       <view class="popup-box">
         <view class="popup-tit">
           <text>优惠券</text>
-          <text
-            class="close"
-            @tap="closePopup"
-          />
+          <text class="close" @tap="closePopup" />
         </view>
         <view class="coupon-tabs">
-          <view
-            :class="'coupon-tab ' + (couponSts==1?'on':'')"
-            data-sts="1"
-            @tap="changeCouponSts"
-          >
+          <view :class="'coupon-tab ' + (couponSts==1?'on':'')" data-sts="1" @tap="changeCouponSts">
             可用优惠券({{ coupons.canUseCoupons.length ? coupons.canUseCoupons.length : 0 }})
           </view>
-          <view
-            :class="'coupon-tab ' + (couponSts==2?'on':'')"
-            data-sts="2"
-            @tap="changeCouponSts"
-          >
+          <view :class="'coupon-tab ' + (couponSts==2?'on':'')" data-sts="2" @tap="changeCouponSts">
             不可用优惠券({{ coupons.unCanUseCoupons.length ? coupons.unCanUseCoupons.length : 0 }})
           </view>
         </view>
         <view class="popup-cnt">
           <block v-if="couponSts == 1">
-            <view
-              v-for="(item, index) in coupons.canUseCoupons"
-              :key="index"
-            >
-              <coupon
-                :item="item"
-                order="true"
-                can-use="true"
-                @check-coupon="checkCoupon"
-              />
+            <view v-for="(item, index) in coupons.canUseCoupons" :key="index">
+              <coupon :item="item" order="true" can-use="true" @check-coupon="checkCoupon" />
             </view>
           </block>
           <block v-if="couponSts == 2">
-            <view
-              v-for="(item, index) in coupons.unCanUseCoupons"
-              :key="index"
-            >
-              <coupon
-                :item="item"
-                order="true"
-                can-use="false"
-              />
+            <view v-for="(item, index) in coupons.unCanUseCoupons" :key="index">
+              <coupon :item="item" order="true" can-use="false" />
             </view>
           </block>
           <view class="botm-empty" />
         </view>
-        <view
-          v-if="couponSts==1"
-          class="coupon-ok"
-        >
+        <view v-if="couponSts==1" class="coupon-ok">
           <text @tap="choosedCoupon">
             确定
           </text>
@@ -298,230 +277,238 @@
 </template>
 
 <script setup>
-const wxs = number()
-let orderEntry = '0' // 订单入口 0购物车 1立即购买
-/**
- * 生命周期函数--监听页面加载
- */
-onLoad((options) => {
-  orderEntry = options.orderEntry
-})
-
-const userAddr = ref(null)
-/**
- * 生命周期函数--监听页面显示
- */
-onShow(() => {
-  const pages = getCurrentPages()
-  const currPage = pages[pages.length - 1]
-  if (currPage.selAddress === 'yes') {
-    // 将携带的参数赋值
-    userAddr.value = currPage.item
-  }
-  // 获取订单数据
-  loadOrderData()
-})
-
-let couponIds = []
-const coupons = ref({})
-const total = ref(0)
-const actualTotal = ref(0)
-const orderItems = ref([])
-const totalCount = ref(0)
-const transfee = ref(0)
-const shopReduce = ref('')
-/**
- * 加载订单数据
- */
-const loadOrderData = () => {
-  let addrId = 0
-  if (userAddr.value != null) {
-    addrId = userAddr.value.addrId
-  }
-  uni.showLoading({
-    mask: true
+  const wxs = number()
+  let orderEntry = '0' // 订单入口 0购物车 1立即购买
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad((options) => {
+    orderEntry = options.orderEntry
   })
-  http.request({
-    url: '/p/order/confirm',
-    method: 'POST',
-    data: {
-      addrId,
-      orderItem: orderEntry === '1' ? JSON.parse(uni.getStorageSync('orderItem')) : undefined,
-      basketIds: orderEntry === '0' ? JSON.parse(uni.getStorageSync('basketIds')) : undefined,
-      couponIds,
-      userChangeCoupon: 1
+
+  const userAddr = ref(null)
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(() => {
+    const pages = getCurrentPages()
+    const currPage = pages[pages.length - 1]
+    if (currPage.selAddress === 'yes') {
+      // 将携带的参数赋值
+      userAddr.value = currPage.item
     }
+    // 获取订单数据
+    loadOrderData()
   })
-    .then(({ data }) => {
-      uni.hideLoading()
-      let orderItemsData = []
-      data.shopCartOrders[0].shopCartItemDiscounts?.forEach(itemDiscount => {
-        orderItemsData = orderItems.value?.concat(itemDiscount.shopCartItems)
+
+  let couponIds = []
+  const coupons = ref({})
+  const total = ref(0)
+  const actualTotal = ref(0)
+  const orderItems = ref([])
+  const totalCount = ref(0)
+  const transfee = ref(0)
+  const shopReduce = ref('')
+  const totalScore = ref(0)
+  /**
+   * 加载订单数据
+   */
+  const loadOrderData = () => {
+    let addrId = 0
+    if (userAddr.value != null) {
+      addrId = userAddr.value.addrId
+    }
+    uni.showLoading({
+      mask: true
+    })
+    http.request({
+        url: '/p/order/confirm',
+        method: 'POST',
+        data: {
+          addrId,
+          orderItem: orderEntry === '1' ? JSON.parse(uni.getStorageSync('orderItem')) : undefined,
+          basketIds: orderEntry === '0' ? JSON.parse(uni.getStorageSync('basketIds')) : undefined,
+          couponIds,
+          userChangeCoupon: 1
+        }
       })
-      if (data.shopCartOrders[0].coupons) {
-        const canUseCoupons = []
-        const unCanUseCoupons = []
-        data.shopCartOrders[0].coupons?.forEach(coupon => {
-          if (coupon.canUse) {
-            canUseCoupons.push(coupon)
-          } else {
-            unCanUseCoupons.push(coupon)
-          }
+      .then(({
+        data
+      }) => {
+        uni.hideLoading()
+        let orderItemsData = []
+        data.shopCartOrders[0].shopCartItemDiscounts?.forEach(itemDiscount => {
+          orderItemsData = orderItems.value?.concat(itemDiscount.shopCartItems)
         })
-        coupons.value = {
-          totalLength: data.shopCartOrders[0].coupons.length,
-          canUseCoupons,
-          unCanUseCoupons
+        if (data.shopCartOrders[0].coupons) {
+          const canUseCoupons = []
+          const unCanUseCoupons = []
+          data.shopCartOrders[0].coupons?.forEach(coupon => {
+            if (coupon.canUse) {
+              canUseCoupons.push(coupon)
+            } else {
+              unCanUseCoupons.push(coupon)
+            }
+          })
+          coupons.value = {
+            totalLength: data.shopCartOrders[0].coupons.length,
+            canUseCoupons,
+            unCanUseCoupons
+          }
         }
-      }
-      orderItems.value = orderItemsData
-      actualTotal.value = data.actualTotal
-      total.value = data.total
-      totalCount.value = data.totalCount
-      userAddr.value = data.userAddr
-      transfee.value = data.shopCartOrders[0].transfee
-      shopReduce.value = data.shopCartOrders[0].shopReduce
-    })
-    .catch(err => {
-      uni.hideLoading()
-      chooseCouponErrHandle(err)
-    })
-}
-
-/**
- * 优惠券选择出错处理方法
- */
-const chooseCouponErrHandle = (res) => {
-  // 优惠券不能共用处理方法
-  if (res.statusCode == 601) {
-    uni.showToast({
-      title: res.data,
-      icon: 'none',
-      duration: 3000,
-      success: () => {
-        couponIds = []
-      }
-    })
-    setTimeout(() => {
-      loadOrderData()
-    }, 2500)
+        orderItems.value = orderItemsData
+        actualTotal.value = data.actualTotal
+        total.value = data.total
+        totalCount.value = data.totalCount
+        userAddr.value = data.userAddr
+        transfee.value = data.shopCartOrders[0].transfee
+        shopReduce.value = data.shopCartOrders[0].shopReduce
+        totalScore.value = data.actualTotalScore
+      })
+      .catch(err => {
+        uni.hideLoading()
+        chooseCouponErrHandle(err)
+      })
   }
-}
 
-/**
- * 提交订单
- */
-const toPay = () => {
-  if (!userAddr.value) {
-    uni.showToast({
-      title: '请选择地址',
-      icon: 'none'
-    })
-    return
+  /**
+   * 优惠券选择出错处理方法
+   */
+  const chooseCouponErrHandle = (res) => {
+    // 优惠券不能共用处理方法
+    if (res.statusCode == 601) {
+      uni.showToast({
+        title: res.data,
+        icon: 'none',
+        duration: 3000,
+        success: () => {
+          couponIds = []
+        }
+      })
+      setTimeout(() => {
+        loadOrderData()
+      }, 2500)
+    }
   }
-  submitOrder()
-}
 
-const remarks = ref('')
-const submitOrder = () => {
-  uni.showLoading({
-    mask: true
-  })
-  http.request({
-    url: '/p/order/submit',
-    method: 'POST',
-    data: {
-      orderShopParam: [{
-        remarks: remarks.value,
-        shopId: 1
-      }]
+  /**
+   * 提交订单
+   */
+  const toPay = () => {
+    if (!userAddr.value) {
+      uni.showToast({
+        title: '请选择地址',
+        icon: 'none'
+      })
+      return
     }
-  })
-    .then(({ data }) => {
-      uni.hideLoading()
-      normalPay(data.orderNumbers)
+    submitOrder()
+  }
+
+  const remarks = ref('')
+  const submitOrder = () => {
+    uni.showLoading({
+      mask: true
     })
-}
+    http.request({
+        url: '/p/order/submit',
+        method: 'POST',
+        data: {
+          orderShopParam: [{
+            remarks: remarks.value,
+            shopId: 1
+          }]
+        }
+      })
+      .then(({
+        data
+      }) => {
+        uni.hideLoading()
+        normalPay(data.orderNumbers)
+      })
+  }
 
-/**
- * 模拟支付，直接提交成功
- * @param orderNumbers
- */
-const normalPay = (orderNumbers) => {
-  uni.showLoading({
-    mask: true
-  })
-  http.request({
-    url: '/p/order/normalPay',
-    method: 'POST',
-    data: {
-      orderNumbers
-    }
-  })
-    .then(({ data }) => {
-      uni.hideLoading()
-      if (data) {
-        uni.showToast({
-          title: '模拟支付成功',
-          icon: 'none'
-        })
-        setTimeout(() => {
-          uni.navigateTo({
-            url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + orderNumbers
-          })
-        }, 1200)
-      } else {
-        uni.showToast({
-          title: '支付失败！',
-          icon: 'none'
-        })
-      }
+  /**
+   * 模拟支付，直接提交成功
+   * @param orderNumbers
+   */
+  const normalPay = (orderNumbers) => {
+    uni.showLoading({
+      mask: true
     })
-}
+    http.request({
+        url: '/p/order/normalPay',
+        method: 'POST',
+        data: {
+          orderNumbers
+        }
+      })
+      .then(({
+        data
+      }) => {
+        uni.hideLoading()
+        if (data) {
+          uni.showToast({
+            title: '模拟支付成功',
+            icon: 'none'
+          })
+          setTimeout(() => {
+            uni.navigateTo({
+              url: '/pages/pay-result/pay-result?sts=1&orderNumbers=' + orderNumbers
+            })
+          }, 1200)
+        } else {
+          uni.showToast({
+            title: '支付失败！',
+            icon: 'none'
+          })
+        }
+      })
+  }
 
-const couponSts = ref(1)
-const changeCouponSts = (e) => {
-  couponSts.value = e.currentTarget.dataset.sts
-}
+  const couponSts = ref(1)
+  const changeCouponSts = (e) => {
+    couponSts.value = e.currentTarget.dataset.sts
+  }
 
-const popupShow = ref(false)
-const showCouponPopup = () => {
-  popupShow.value = true
-}
-const closePopup = () => {
-  popupShow.value = false
-}
+  const popupShow = ref(false)
+  const showCouponPopup = () => {
+    popupShow.value = true
+  }
+  const closePopup = () => {
+    popupShow.value = false
+  }
 
-/**
- * 去地址页面
- */
-const toAddrListPage = () => {
-  uni.navigateTo({
-    url: '/pages/delivery-address/delivery-address?order=0'
-  })
-}
+  /**
+   * 去地址页面
+   */
+  const toAddrListPage = () => {
+    uni.navigateTo({
+      url: '/pages/delivery-address/delivery-address?order=0'
+    })
+  }
 
-/**
- * 确定选择好的优惠券
- */
-const choosedCoupon = () => {
-  loadOrderData()
-  popupShow.value = false
-}
+  /**
+   * 确定选择好的优惠券
+   */
+  const choosedCoupon = () => {
+    loadOrderData()
+    popupShow.value = false
+  }
 
-/**
- * 优惠券子组件发过来
- */
-const checkCoupon = (e) => {
-  const index = couponIds.indexOf(e.detail.couponId)
-  if (index === -1) {
-    couponIds.push(e.detail.couponId)
-  } else {
-    couponIds.splice(index, 1)
+  /**
+   * 优惠券子组件发过来
+   */
+  const checkCoupon = (e) => {
+    const index = couponIds.indexOf(e.detail.couponId)
+    if (index === -1) {
+      couponIds.push(e.detail.couponId)
+    } else {
+      couponIds.splice(index, 1)
+    }
   }
-}
 </script>
 
 <style scoped lang="scss">
-@use './submit-order.scss';
+  @use './submit-order.scss';
 </style>
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 51aed0b..9954a71 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -1,21 +1,16 @@
 <template>
   <view class="container">
     <!-- 用户信息 -->
-    <view
-      v-if="isAuthInfo"
-      class="userinfo"
-    >
+    <view v-if="isAuthInfo" class="userinfo">
       <view class="userinfo-con">
         <view class="userinfo-avatar">
-          <image
-            :src="
+          <image :src="
               loginResult.pic
                 ?
                   (loginResult.pic.indexOf('http') === -1 ? picDomain + loginResult.pic : loginResult.pic)
                 :
                   '/static/images/icon/head04.png'
-            "
-          />
+            " />
         </view>
         <view class="userinfo-name">
           <view>{{ loginResult.nickName ? loginResult.nickName : "用户昵称" }}</view>
@@ -23,20 +18,11 @@
       </view>
     </view>
 
-    <view
-      v-if="!isAuthInfo"
-      class="userinfo-none"
-    >
-      <view
-        class="default-pic"
-        @tap="toLogin"
-      >
+    <view v-if="!isAuthInfo" class="userinfo-none">
+      <view class="default-pic" @tap="toLogin">
         <image src="@/static/images/icon/head04.png" />
       </view>
-      <view
-        class="none-login"
-        @tap="toLogin"
-      >
+      <view class="none-login" @tap="toLogin">
         <button class="unlogin">
           未登录
         </button>
@@ -54,63 +40,34 @@
           <text style="font-weight:bold">
             我的订单
           </text>
-          <view
-            class="checkmore"
-            data-sts="0"
-            @tap="toOrderListPage"
-          >
+          <view class="checkmore" data-sts="0" @tap="toOrderListPage">
             <text>查看全部</text>
             <text class="arrowhead" />
           </view>
         </view>
         <view class="procedure">
-          <view
-            class="items"
-            data-sts="1"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="1" @tap="toOrderListPage">
             <image src="@/static/images/icon/toPay.png" />
             <text>待支付</text>
-            <text
-              v-if="orderAmount.unPay>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.unPay>0" class="num-badge">
               {{ orderAmount.unPay }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="2"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="2" @tap="toOrderListPage">
             <image src="@/static/images/icon/toDelivery.png" />
             <text>待发货</text>
-            <text
-              v-if="orderAmount.payed>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.payed>0" class="num-badge">
               {{ orderAmount.payed }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="3"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="3" @tap="toOrderListPage">
             <image src="@/static/images/icon/toTake.png" />
             <text>待收货</text>
-            <text
-              v-if="orderAmount.consignment>0"
-              class="num-badge"
-            >
+            <text v-if="orderAmount.consignment>0" class="num-badge">
               {{ orderAmount.consignment }}
             </text>
           </view>
-          <view
-            class="items"
-            data-sts="5"
-            @tap="toOrderListPage"
-          >
+          <view class="items" data-sts="5" @tap="toOrderListPage">
             <image src="@/static/images/icon/toComment.png" />
             <text>已完成</text>
           </view>
@@ -119,60 +76,33 @@
       <!--end 订单状态 -->
 
       <view class="prod-col">
-        <view
-          class="col-item"
-          @tap="myCollectionHandle"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="myCollectionHandle">
+          <view v-if="loginResult" class="num">
             {{ collectionCount }}
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
             我的收藏
           </view>
         </view>
-        <view
-          class="col-item"
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="handleTips">
+          <view v-if="loginResult" class="num">
             5
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
             我的消息
           </view>
         </view>
-        <view
-          class="col-item"
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
+        <view class="col-item" @tap="handleTips">
+          <view v-if="loginResult" class="num">
             3
           </view>
-          <view
-            v-else
-            class="num"
-          >
+          <view v-else class="num">
             --
           </view>
           <view class="tit">
@@ -182,40 +112,49 @@
       </view>
 
       <view class="my-menu">
-        <view
-          class="memu-item"
-          @tap="toDistCenter"
-        >
+        <view class="memu-item" @tap="toMemberInfoPage">
+          <view class="i-name">
+            <image src="@/static/images/icon/promotion.png" />
+            <text>会员信息</text>
+          </view>
+          <view class="arrowhead" />
+        </view>
+        <view class="memu-item" @tap="toScorePage">
+          <view class="i-name">
+            <image src="@/static/images/icon/promotion.png" />
+            <text>积分商城</text>
+          </view>
+          <view class="arrowhead" />
+        </view>
+        <view class="memu-item" @tap="toMemberPage">
+          <view class="i-name">
+            <image src="@/static/images/icon/promotion.png" />
+            <text>会员专区</text>
+          </view>
+          <view class="arrowhead" />
+        </view>
+        <view class="memu-item" @tap="toDistCenter">
           <view class="i-name">
             <image src="@/static/images/icon/promotion.png" />
             <text>分销中心</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toCouponCenter"
-        >
+        <view class="memu-item" @tap="toCouponCenter">
           <view class="i-name">
             <image src="@/static/images/icon/getCoupon.png" />
             <text>领券中心</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toMyCouponPage"
-        >
+        <view class="memu-item" @tap="toMyCouponPage">
           <view class="i-name">
             <image src="@/static/images/icon/myCoupon.png" />
             <text>我的优惠券</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
-          class="memu-item"
-          @tap="toAddressList"
-        >
+        <view class="memu-item" @tap="toAddressList">
           <view class="i-name">
             <image src="@/static/images/icon/myAddr.png" />
             <text>收货地址</text>
@@ -225,11 +164,7 @@
       </view>
       <!--end 列表项 -->
 
-      <view
-        v-if="isAuthInfo"
-        class="log-out"
-        @tap="logout"
-      >
+      <view v-if="isAuthInfo" class="log-out" @tap="logout">
         <view class="log-out-n">
           <text>退出登录</text>
         </view>
@@ -239,137 +174,158 @@
 </template>
 
 <script setup>
-const picDomain = import.meta.env.VITE_APP_RESOURCES_URL
+  const picDomain = import.meta.env.VITE_APP_RESOURCES_URL
 
-const isAuthInfo = ref(false)
-const loginResult = ref('')
-const orderAmount = ref('')
-/**
- * 生命周期函数--监听页面显示
- */
-onShow(() => {
-  loginResult.value = uni.getStorageSync('loginResult')
-  isAuthInfo.value = !!loginResult.value
-  // 加载订单数字
-  if (isAuthInfo.value) {
+  const isAuthInfo = ref(false)
+  const loginResult = ref('')
+  const orderAmount = ref('')
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow(() => {
+    loginResult.value = uni.getStorageSync('loginResult')
+    isAuthInfo.value = !!loginResult.value
+    // 加载订单数字
+    if (isAuthInfo.value) {
+      uni.showLoading()
+      http.request({
+          url: '/p/myOrder/orderCount',
+          method: 'GET',
+          data: {}
+        })
+        .then(({
+          data
+        }) => {
+          uni.hideLoading()
+          orderAmount.value = data
+        })
+      showCollectionCount()
+    }
+  })
+  const toMemberInfoPage = () => {
+    uni.navigateTo({
+      url: '/pages/member-info/member-info'
+    })
+  }
+  const toScorePage = () => {
+    uni.navigateTo({
+      url: '/pages/score/score'
+    })
+  }
+  const toMemberPage = () => {
+    uni.navigateTo({
+      url: '/pages/member/member'
+    })
+  }
+  const toDistCenter = () => {
+    uni.showToast({
+      icon: 'none',
+      title: '该功能未开源'
+    })
+  }
+  const toCouponCenter = () => {
+    uni.showToast({
+      icon: 'none',
+      title: '该功能未开源'
+    })
+  }
+  const toMyCouponPage = () => {
+    /* uni.showToast({
+      icon: 'none',
+      title: '该功能未开源'
+    }) */
+    uni.navigateTo({
+      url: '/pages/delivery-address/delivery-address'
+    })
+  }
+  const handleTips = () => {
+    uni.showToast({
+      icon: 'none',
+      title: '该功能未开源'
+    })
+  }
+  const toAddressList = () => {
+    uni.navigateTo({
+      url: '/pages/delivery-address/delivery-address'
+    })
+  }
+
+  const toOrderListPage = (e) => {
+    const sts = e.currentTarget.dataset.sts
+    uni.navigateTo({
+      url: '/pages/orderList/orderList?sts=' + sts
+    })
+  }
+
+  const collectionCount = ref(0)
+  /**
+   * 查询所有的收藏量
+   */
+  const showCollectionCount = () => {
     uni.showLoading()
     http.request({
-      url: '/p/myOrder/orderCount',
-      method: 'GET',
-      data: {}
-    })
-      .then(({ data }) => {
+        url: '/p/user/collection/count',
+        method: 'GET',
+        data: {}
+      })
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
-        orderAmount.value = data
+        collectionCount.value = data
       })
-    showCollectionCount()
   }
-})
 
-const toDistCenter = () => {
-  uni.showToast({
-    icon: 'none',
-    title: '该功能未开源'
-  })
-}
-const toCouponCenter = () => {
-  uni.showToast({
-    icon: 'none',
-    title: '该功能未开源'
-  })
-}
-const toMyCouponPage = () => {
-  uni.showToast({
-    icon: 'none',
-    title: '该功能未开源'
-  })
-}
-const handleTips = () => {
-  uni.showToast({
-    icon: 'none',
-    title: '该功能未开源'
-  })
-}
-const toAddressList = () => {
-  uni.navigateTo({
-    url: '/pages/delivery-address/delivery-address'
-  })
-}
-
-const toOrderListPage = (e) => {
-  const sts = e.currentTarget.dataset.sts
-  uni.navigateTo({
-    url: '/pages/orderList/orderList?sts=' + sts
-  })
-}
-
-const collectionCount = ref(0)
-/**
- * 查询所有的收藏量
- */
-const showCollectionCount = () => {
-  uni.showLoading()
-  http.request({
-    url: '/p/user/collection/count',
-    method: 'GET',
-    data: {}
-  })
-    .then(({ data }) => {
-      uni.hideLoading()
-      collectionCount.value = data
+  /**
+   * 我的收藏跳转
+   */
+  const myCollectionHandle = () => {
+    let url = '/pages/prod-classify/prod-classify?sts=5'
+    const id = 0
+    const title = '我的收藏商品'
+    if (id) {
+      url += '&tagid=' + id + '&title=' + title
+    }
+    uni.navigateTo({
+      url
     })
-}
-
-/**
- * 我的收藏跳转
- */
-const myCollectionHandle = () => {
-  let url = '/pages/prod-classify/prod-classify?sts=5'
-  const id = 0
-  const title = '我的收藏商品'
-  if (id) {
-    url += '&tagid=' + id + '&title=' + title
   }
-  uni.navigateTo({
-    url
-  })
-}
 
-/**
- * 去登陆
- */
-const toLogin = () => {
-  uni.navigateTo({
-    url: '/pages/accountLogin/accountLogin'
-  })
-}
+  /**
+   * 去登陆
+   */
+  const toLogin = () => {
+    uni.navigateTo({
+      url: '/pages/accountLogin/accountLogin'
+    })
+  }
 
-/**
- * 退出登录
- */
-const logout = () => {
-  http.request({
-    url: '/logOut',
-    method: 'post'
-  })
-    .then(() => {
-      util.removeTabBadge()
-      uni.removeStorageSync('loginResult')
-      uni.removeStorageSync('token')
-      uni.showToast({
-        title: '退出成功',
-        icon: 'none'
+  /**
+   * 退出登录
+   */
+  const logout = () => {
+    http.request({
+        url: '/logOut',
+        method: 'post'
       })
-      orderAmount.value = ''
-      setTimeout(() => {
-        uni.switchTab({
-          url: '/pages/index/index'
+      .then(() => {
+        util.removeTabBadge()
+        uni.removeStorageSync('loginResult')
+        uni.removeStorageSync('token')
+        uni.showToast({
+          title: '退出成功',
+          icon: 'none'
         })
-      }, 1000)
-    })
-}
+        orderAmount.value = ''
+        setTimeout(() => {
+          uni.switchTab({
+            url: '/pages/index/index'
+          })
+        }, 1000)
+      })
+  }
 </script>
 
 <style scoped lang="scss">
-@use './user.scss';
+  @use './user.scss';
 </style>