init

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",

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",

src/pages/basket/basket.vue

@@ -1,15 +1,9 @@
 <template>
   <view class="container">
     <view class="prod-list">
-      <block
+      <block v-for="(item, scIndex) in shopCartItemDiscounts" :key="scIndex">
-        v-for="(item, scIndex) in shopCartItemDiscounts"
-        :key="scIndex"
-      >
         <view class="prod-block">
-          <view
+          <view v-if="item.chooseDiscountItemDto" class="discount-tips">
-            v-if="item.chooseDiscountItemDto"
-            class="discount-tips"
-          >
             <text class="text-block">
               {{ wxs.parseDiscount(item.chooseDiscountItemDto.discountRule) }}
             </text>
@@ -19,21 +13,12 @@
               }}
             </text>
           </view>
-          <block
+          <block v-for="(prod, index) in item.shopCartItems" :key="index">
-            v-for="(prod, index) in item.shopCartItems"
-            :key="index"
-          >
             <view class="item">
               <view class="btn">
                 <label>
-                  <checkbox
+                  <checkbox :data-scindex="scIndex" :data-index="index" :value="prod.prodId" :checked="prod.checked"
-                    :data-scindex="scIndex"
+                    color="#105c3e" @tap="onSelectedItem" />
-                    :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
+                      <view class="minus" :data-scindex="scIndex" :data-index="index" @tap="onCountMinus" />
-                        class="minus"
+                      <input type="number" :value="prod.prodCount" disabled>
-                        :data-scindex="scIndex"
+                      <view class="plus" :data-scindex="scIndex" :data-index="index" @tap="onCountPlus" />
-                        :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
+    <view v-if="!shopCartItemDiscounts.length" class="empty">
-      v-if="!shopCartItemDiscounts.length"
-      class="empty"
-    >
       <view class="img">
         <image src="@/static/images/tabbar/basket.png" />
       </view>
@@ -100,28 +74,26 @@
     </view>
 
     <!-- 底部按钮 -->
-    <view
+    <view v-if="shopCartItemDiscounts.length>0" class="cart-footer">
-      v-if="shopCartItemDiscounts.length>0"
-      class="cart-footer"
-    >
       <view class="btn all">
-        <checkbox
+        <checkbox :checked="allChecked" color="#f7d731;" @tap="onSelAll" />
-          :checked="allChecked"
-          color="#f7d731;"
-          @tap="onSelAll"
-        />
         全选
       </view>
-      <view
+      <view class="btn del" @tap="onDelBasket">
-        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
+        <view v-if="subtractMoney>0" class="total-msg">
-          v-if="subtractMoney>0"
-          class="total-msg"
-        >
           总额:￥{{ wxs.toPrice(totalMoney) }} 立减:￥{{ wxs.toPrice(subtractMoney) }}
         </view>
       </view>
-      <view
+      <view class="btn settle" @tap="toFirmOrder">
-        class="btn settle"
-        @tap="toFirmOrder"
-      >
         <text>结算</text>
       </view>
     </view>
@@ -170,7 +136,9 @@ const loadBasketData = () => {
         method: 'POST',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         if (data.length > 0) {
           // 默认不选中
           const shopCartItemDiscountsParam = data[0].shopCartItemDiscounts
@@ -272,6 +240,7 @@ const checkAllSelected = () => {
 
   const totalMoney = ref(0)
   const subtractMoney = ref(0)
+  const totalScore = ref(0)
   const finalMoney = ref(0)
   /**
    * 计算购物车总额
@@ -293,9 +262,12 @@ const calTotalPrice = () => {
         method: 'POST',
         data: shopCartIds
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         finalMoney.value = data.finalMoney
         totalMoney.value = data.totalMoney
+        totalScore.value = data.totalScore
         subtractMoney.value = data.subtractMoney
         uni.hideLoading()
       })

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>

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;
+  }
+}

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>

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;
+}

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>

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()
     })
 }

src/pages/prod/prod.vue

@@ -2,18 +2,9 @@
   <!-- 商品详情 -->
   <view class="container">
     <!-- 轮播图 -->
-    <swiper
+    <swiper :indicator-dots="indicatorDots" :autoplay="autoplay" :indicator-color="indicatorColor" :interval="interval"
-      :indicator-dots="indicatorDots"
+      :duration="duration" :indicator-active-color="indicatorActiveColor">
-      :autoplay="autoplay"
+      <block v-for="(item, index) in imgs" :key="index">
-      :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
+        <view class="col" @tap="addOrCannelCollection">
-          class="col"
+          <image v-if="!isCollection" src="@/static/images/icon/prod-col.png" />
-          @tap="addOrCannelCollection"
+          <image v-if="isCollection" src="@/static/images/icon/prod-col-red.png" />
-        >
-          <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">
+      <view class="prod-price" v-if="productType ==0 || productType==1">
-        <text
+        <text v-if="defaultSku && defaultSku.price" class="price">
-          v-if="defaultSku && defaultSku.price"
-          class="price"
-        >
           ￥
           <text class="price-num">
             {{ wxs.parsePrice(defaultSku.price)[0] }}
           </text>
           .{{ wxs.parsePrice(defaultSku.price)[1] }}
         </text>
-        <text
+        <text v-if="defaultSku && defaultSku.oriPrice" class="ori-price">
-          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
+    <view class="sku" @tap="showSku">
-      class="sku"
-      @tap="showSku"
-    >
       <view class="sku-tit">
         已选
       </view>
@@ -81,10 +65,7 @@
     </view>
     <!-- 评价 -->
     <view class="cmt-wrap">
-      <view
+      <view class="cmt-tit" @tap="showComment">
-        class="cmt-tit"
-        @tap="showComment"
-      >
         <view class="cmt-t">
           评价
           <text class="cmt-good">
@@ -97,10 +78,7 @@
         </view>
       </view>
       <view class="cmt-cont">
-        <view
+        <view class="cmt-tag" @tap="showComment">
-          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
+          <view v-for="(item, index) in littleCommPage" :key="index" class="cmt-item">
-            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
+                <image class="user-img" :src="item.pic" />
-                  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
+            <scroll-view v-if="item.pics.length" class="cmt-attr" scroll-x="true">
-              v-if="item.pics.length"
+              <image v-for="(commPic, index2) in item.pics" :key="index2" :src="commPic" />
-              class="cmt-attr"
-              scroll-x="true"
-            >
-              <image
-                v-for="(commPic, index2) in item.pics"
-                :key="index2"
-                :src="commPic"
-              />
             </scroll-view>
           </view>
         </view>
-        <view
+        <view v-if="prodCommPage.records.length > 2" class="cmt-more-v">
-          v-if="prodCommPage.records.length > 2"
-          class="cmt-more-v"
-        >
           <text @tap="showComment">
             查看全部评价
           </text>
@@ -163,98 +123,62 @@
 
     <!-- 底部按钮 -->
     <view class="cart-footer">
-      <view
+      <view class="btn icon" @tap="toHomePage">
-        class="btn icon"
-        @tap="toHomePage"
-      >
         <image src="@/static/images/tabbar/homepage.png" />
         首页
       </view>
-      <view
+      <view class="btn icon" @tap="toCartPage">
-        class="btn icon"
-        @tap="toCartPage"
-      >
         <image src="@/static/images/tabbar/basket.png" />
         购物车
-        <view
+        <view v-if="totalCartNum>0" class="badge badge-1">
-          v-if="totalCartNum>0"
-          class="badge badge-1"
-        >
           {{ totalCartNum }}
         </view>
       </view>
-      <view
+      <view class="btn cart" @tap="showSku">
-        class="btn cart"
-        @tap="showSku"
-      >
         <text>加入购物车</text>
       </view>
-      <view
+      <view class="btn buy" @tap="showSku">
-        class="btn buy"
-        @tap="showSku"
-      >
         <text>立即购买</text>
       </view>
     </view>
     <!-- end 底部按钮 -->
 
     <!-- 规格弹窗 -->
-    <view
+    <view v-if="skuShow" class="pup-sku">
-      v-if="skuShow"
-      class="pup-sku"
-    >
       <view class="pup-sku-main">
         <view class="pup-sku-header">
-          <image
+          <image class="pup-sku-img" :src="defaultSku.pic?defaultSku.pic:pic" />
-            class="pup-sku-img"
+          <view class="pup-sku-price" v-if="productType != 2">
-            :src="defaultSku.pic?defaultSku.pic:pic"
-          />
-          <view class="pup-sku-price">
             ￥
-            <text
+            <text v-if="defaultSku && defaultSku.price" class="pup-sku-price-int">
-              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
+          <view class="close" @tap="closePopup" />
-            class="close"
-            @tap="closePopup"
-          />
         </view>
         <view class="pup-sku-body">
           <view class="pup-sku-area">
-            <view
+            <view v-if="skuList.length" class="sku-box">
-              v-if="skuList.length"
+              <block v-for="(skuGroupItem, skuGroupItemIndex) in skuGroupList" :key="skuGroupItemIndex">
-              class="sku-box"
+                <view v-for="(skuLine, key) in skuGroupItem" :key="key" class="items sku-text">
-            >
-              <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
+                    <text v-for="skuLineItem in skuLine" :key="skuLineItem" class="sku-choose-item"
-                      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' : '']"
+                               isSkuLineItemNotOptional(allProperties,selectedPropObj,key,skuLineItem,propKeys)? 'dashed' : '']" @click="toChooseItem(skuGroupItemIndex, skuLineItem, key)">
-                      @click="toChooseItem(skuGroupItemIndex, skuLineItem, key)"
-                    >
                       {{ skuLineItem }}
                     </text>
                   </view>
@@ -264,23 +188,13 @@
           </view>
           <view class="pup-sku-count">
             <view class="num-wrap">
-              <view
+              <view class="minus" @tap="onCountMinus">
-                class="minus"
-                @tap="onCountMinus"
-              >
                 <text class="row" />
               </view>
               <view class="text-wrap">
-                <input
+                <input type="number" :value="prodNum" disabled>
-                  type="number"
+              </view>
-                  :value="prodNum"
+              <view class="plus" @tap="onCountPlus">
-                  disabled
-                >
-              </view>
-              <view
-                class="plus"
-                @tap="onCountPlus"
-              >
                 <text class="row" />
                 <text class="col" />
               </view>
@@ -291,16 +205,10 @@
           </view>
         </view>
         <view class="pup-sku-footer">
-          <view
+          <view class="btn cart" @tap="addToCart">
-            class="btn cart"
-            @tap="addToCart"
-          >
             加入购物车
           </view>
-          <view
+          <view class="btn buy" @tap="buyNow">
-            class="btn buy"
-            @tap="buyNow"
-          >
             立即购买
           </view>
         </view>
@@ -308,10 +216,7 @@
     </view>
 
     <!-- 评价弹窗 -->
-    <view
+    <view v-if="commentShow" class="cmt-popup">
-      v-if="commentShow"
-      class="cmt-popup"
-    >
       <view class="cmt-tit">
         <view class="cmt-t">
           商品评价
@@ -319,65 +224,35 @@
             好评度{{ prodCommData.positiveRating }}%
           </text>
         </view>
-        <text
+        <text class="close" @tap="closePopup" />
-          class="close"
-          @tap="closePopup"
-        />
       </view>
       <view class="cmt-cont">
         <view class="cmt-tag">
-          <text
+          <text data-evaluate="-1" :class="evaluate==-1?'selected':''" @tap="getProdCommPage">
-            data-evaluate="-1"
-            :class="evaluate==-1?'selected':''"
-            @tap="getProdCommPage"
-          >
             全部({{ prodCommData.number }})
           </text>
-          <text
+          <text data-evaluate="0" :class="evaluate==0?'selected':''" @tap="getProdCommPage">
-            data-evaluate="0"
-            :class="evaluate==0?'selected':''"
-            @tap="getProdCommPage"
-          >
             好评({{ prodCommData.praiseNumber }})
           </text>
-          <text
+          <text data-evaluate="1" :class="evaluate==1?'selected':''" @tap="getProdCommPage">
-            data-evaluate="1"
-            :class="evaluate==1?'selected':''"
-            @tap="getProdCommPage"
-          >
             中评({{ prodCommData.secondaryNumber }})
           </text>
-          <text
+          <text data-evaluate="2" :class="evaluate==2?'selected':''" @tap="getProdCommPage">
-            data-evaluate="2"
-            :class="evaluate==2?'selected':''"
-            @tap="getProdCommPage"
-          >
             差评({{ prodCommData.negativeNumber }})
           </text>
-          <text
+          <text data-evaluate="3" :class="evaluate==3?'selected':''" @tap="getProdCommPage">
-            data-evaluate="3"
-            :class="evaluate==3?'selected':''"
-            @tap="getProdCommPage"
-          >
             有图({{ prodCommData.picNumber }})
           </text>
         </view>
         <view class="cmt-items">
           <block v-if="prodCommPage.records.length">
-            <view
+            <view v-for="(item, index) in prodCommPage.records" :key="index" class="cmt-item">
-              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
+                  <image class="user-img" :src="item.pic" />
-                    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
+              <scroll-view v-if="item.pics.length" class="cmt-attr" scroll-x="true">
-                v-if="item.pics.length"
+                <image v-for="(commPic, index2) in item.pics" :key="index2" :src="commPic" />
-                class="cmt-attr"
-                scroll-x="true"
-              >
-                <image
-                  v-for="(commPic, index2) in item.pics"
-                  :key="index2"
-                  :src="commPic"
-                />
               </scroll-view>
-              <view
+              <view v-if="item.replyContent" class="cmt-reply">
-                v-if="item.replyContent"
-                class="cmt-reply"
-              >
                 <text class="reply-tit">
                   店铺回复：
                 </text>
@@ -408,17 +272,11 @@
               </view>
             </view>
           </block>
-          <view
+          <view v-if="!prodCommPage.records.length" class="empty">
-            v-if="!prodCommPage.records.length"
-            class="empty"
-          >
             暂无评价
           </view>
         </view>
-        <view
+        <view v-if="prodCommPage.pages > prodCommPage.current" class="load-more">
-          v-if="prodCommPage.pages > prodCommPage.current"
-          class="load-more"
-        >
           <text @tap="getMoreCommPage">
             点击加载更多
           </text>
@@ -482,7 +340,9 @@ const getCollection = () => {
           prodId
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         isCollection.value = data
         uni.hideLoading()
       })
@@ -512,6 +372,9 @@ const imgs = ref('')
   const prodName = ref('')
   const price = ref(0)
   const content = ref('')
+  let payScore = 1000
+  let giveScore = 0
+  const productType = ref(0)
   /**
    * 获取商品信息
    */
@@ -524,7 +387,9 @@ const getProdInfo = () => {
           prodId // userType: 0
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         if (!data) {
           setTimeout(() => {
@@ -540,6 +405,9 @@ const getProdInfo = () => {
         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()
@@ -555,7 +423,9 @@ const getProdCommData = () => {
           prodId
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         prodCommData.value = data
       })
   }
@@ -607,7 +477,9 @@ const getProdCommPage = (e) => {
           evaluate: evaluate.value
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         data.records.forEach(item => {
           if (item.pics) {
             item.pics = item.pics.split(',')

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;
+}

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>

src/pages/sub-category/sub-category.scss

@@ -1,5 +1,21 @@
 .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%;

src/pages/sub-category/sub-category.vue

@@ -1,22 +1,10 @@
 <template>
   <view class="Mall4j container">
     <!-- 顶部子分类tab -->
-    <scroll-view
+    <scroll-view scroll-x="true" class="category-tit" :scroll-into-view="intoView" :scroll-with-animation="true">
-      scroll-x="true"
+      <block v-for="(item, index) in subCategoryList" :key="index">
-      class="category-tit"
+        <view :id="'sw' + item.categoryId" :class="'category-item ' + (item.categoryId==categoryId? 'on':'')"
-      :scroll-into-view="intoView"
+          :data-id="item.categoryId" @tap="onSubCategoryTap">
-      :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
+        <block v-for="(prod, key) in prodList" :key="key">
-          v-for="(prod, key) in prodList"
+          <view class="prod-items" :data-prodid="prod.prodId" @tap="toProdPage">
-          :key="key"
-        >
-          <view
-            class="prod-items"
-            :data-prodid="prod.prodId"
-            @tap="toProdPage"
-          >
             <view class="hot-imagecont">
-              <image
+              <image :src="prod.pic" class="hotsaleimg" />
-                :src="prod.pic"
-                class="hotsaleimg"
-              />
             </view>
             <view class="hot-text">
               <view class="hotprod-text">
@@ -63,10 +41,7 @@
           </view>
         </block>
       </block>
-      <view
+      <view v-else class="empty-wrap">
-        v-else
-        class="empty-wrap"
-      >
         暂无商品数据~
       </view>
     </view>
@@ -113,7 +88,9 @@ const getSubCategory = () => {
           parentId: parentId.value
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         subCategoryList.value = data
         nextTick(() => {
           intoView.value = 'sw' + categoryId.value
@@ -140,7 +117,9 @@ const getProdList = () => {
           isAllProdType: true
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         isLoaded.value = true
         prodList.value = data.current == 1 ? data.records : prodList.value.concat(data.records)
         current.value = data.current

src/pages/submit-order/submit-order.vue

@@ -3,14 +3,8 @@
     <view class="container">
       <view class="submit-order">
         <!-- 收货地址 -->
-        <view
+        <view class="delivery-addr " @tap="toAddrListPage">
-          class="delivery-addr "
+          <view v-if="!userAddr" class="addr-bg ">
-          @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
+          <view v-if="userAddr" class="addr-bg whole">
-            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
+          <block v-for="(item, index) in orderItems" :key="index">
-            v-for="(item, index) in orderItems"
+            <view class="item-cont" :data-ordernum="item.primaryOrderNo" @tap="toOrderDetailPage">
-            :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
+            <view class="item coupon" @tap="showCouponPopup">
-              class="item coupon"
-              @tap="showCouponPopup"
-            >
               <text class="item-tit">
                 优惠券：
               </text>
-              <text
+              <text v-if="!coupons.canUseCoupons" class="item-txt">
-                v-if="!coupons.canUseCoupons"
-                class="item-txt"
-              >
                 暂无可用
               </text>
               <text class="coupon-btn">
@@ -124,10 +123,7 @@
             </view>
             <view class="item">
               <text>买家留言：</text>
-              <input
+              <input v-model="remarks" placeholder="给卖家留言">
-                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
+        <view class="footer-box" @tap="toPay">
-          class="footer-box"
-          @tap="toPay"
-        >
           提交订单
         </view>
       </view>
     </view>
 
     <!-- 选择优惠券弹窗 -->
-    <view
+    <view v-if="popupShow" class="popup-hide">
-      v-if="popupShow"
-      class="popup-hide"
-    >
       <view class="popup-box">
         <view class="popup-tit">
           <text>优惠券</text>
-          <text
+          <text class="close" @tap="closePopup" />
-            class="close"
-            @tap="closePopup"
-          />
         </view>
         <view class="coupon-tabs">
-          <view
+          <view :class="'coupon-tab ' + (couponSts==1?'on':'')" data-sts="1" @tap="changeCouponSts">
-            :class="'coupon-tab ' + (couponSts==1?'on':'')"
-            data-sts="1"
-            @tap="changeCouponSts"
-          >
             可用优惠券({{ coupons.canUseCoupons.length ? coupons.canUseCoupons.length : 0 }})
           </view>
-          <view
+          <view :class="'coupon-tab ' + (couponSts==2?'on':'')" data-sts="2" @tap="changeCouponSts">
-            :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
+            <view v-for="(item, index) in coupons.canUseCoupons" :key="index">
-              v-for="(item, index) in coupons.canUseCoupons"
+              <coupon :item="item" order="true" can-use="true" @check-coupon="checkCoupon" />
-              :key="index"
-            >
-              <coupon
-                :item="item"
-                order="true"
-                can-use="true"
-                @check-coupon="checkCoupon"
-              />
             </view>
           </block>
           <block v-if="couponSts == 2">
-            <view
+            <view v-for="(item, index) in coupons.unCanUseCoupons" :key="index">
-              v-for="(item, index) in coupons.unCanUseCoupons"
+              <coupon :item="item" order="true" can-use="false" />
-              :key="index"
-            >
-              <coupon
-                :item="item"
-                order="true"
-                can-use="false"
-              />
             </view>
           </block>
           <view class="botm-empty" />
         </view>
-        <view
+        <view v-if="couponSts==1" class="coupon-ok">
-          v-if="couponSts==1"
-          class="coupon-ok"
-        >
           <text @tap="choosedCoupon">
             确定
           </text>
@@ -330,6 +309,7 @@ const orderItems = ref([])
   const totalCount = ref(0)
   const transfee = ref(0)
   const shopReduce = ref('')
+  const totalScore = ref(0)
   /**
    * 加载订单数据
    */
@@ -352,7 +332,9 @@ const loadOrderData = () => {
           userChangeCoupon: 1
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         let orderItemsData = []
         data.shopCartOrders[0].shopCartItemDiscounts?.forEach(itemDiscount => {
@@ -381,6 +363,7 @@ const loadOrderData = () => {
         userAddr.value = data.userAddr
         transfee.value = data.shopCartOrders[0].transfee
         shopReduce.value = data.shopCartOrders[0].shopReduce
+        totalScore.value = data.actualTotalScore
       })
       .catch(err => {
         uni.hideLoading()
@@ -437,7 +420,9 @@ const submitOrder = () => {
           }]
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         normalPay(data.orderNumbers)
       })
@@ -458,7 +443,9 @@ const normalPay = (orderNumbers) => {
           orderNumbers
         }
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         if (data) {
           uni.showToast({

src/pages/user/user.vue

@@ -1,21 +1,16 @@
 <template>
   <view class="container">
     <!-- 用户信息 -->
-    <view
+    <view v-if="isAuthInfo" class="userinfo">
-      v-if="isAuthInfo"
-      class="userinfo"
-    >
       <view class="userinfo-con">
         <view class="userinfo-avatar">
-          <image
+          <image :src="
-            :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
+    <view v-if="!isAuthInfo" class="userinfo-none">
-      v-if="!isAuthInfo"
+      <view class="default-pic" @tap="toLogin">
-      class="userinfo-none"
-    >
-      <view
-        class="default-pic"
-        @tap="toLogin"
-      >
         <image src="@/static/images/icon/head04.png" />
       </view>
-      <view
+      <view class="none-login" @tap="toLogin">
-        class="none-login"
-        @tap="toLogin"
-      >
         <button class="unlogin">
           未登录
         </button>
@@ -54,63 +40,34 @@
           <text style="font-weight:bold">
             我的订单
           </text>
-          <view
+          <view class="checkmore" data-sts="0" @tap="toOrderListPage">
-            class="checkmore"
-            data-sts="0"
-            @tap="toOrderListPage"
-          >
             <text>查看全部</text>
             <text class="arrowhead" />
           </view>
         </view>
         <view class="procedure">
-          <view
+          <view class="items" data-sts="1" @tap="toOrderListPage">
-            class="items"
-            data-sts="1"
-            @tap="toOrderListPage"
-          >
             <image src="@/static/images/icon/toPay.png" />
             <text>待支付</text>
-            <text
+            <text v-if="orderAmount.unPay>0" class="num-badge">
-              v-if="orderAmount.unPay>0"
-              class="num-badge"
-            >
               {{ orderAmount.unPay }}
             </text>
           </view>
-          <view
+          <view class="items" data-sts="2" @tap="toOrderListPage">
-            class="items"
-            data-sts="2"
-            @tap="toOrderListPage"
-          >
             <image src="@/static/images/icon/toDelivery.png" />
             <text>待发货</text>
-            <text
+            <text v-if="orderAmount.payed>0" class="num-badge">
-              v-if="orderAmount.payed>0"
-              class="num-badge"
-            >
               {{ orderAmount.payed }}
             </text>
           </view>
-          <view
+          <view class="items" data-sts="3" @tap="toOrderListPage">
-            class="items"
-            data-sts="3"
-            @tap="toOrderListPage"
-          >
             <image src="@/static/images/icon/toTake.png" />
             <text>待收货</text>
-            <text
+            <text v-if="orderAmount.consignment>0" class="num-badge">
-              v-if="orderAmount.consignment>0"
-              class="num-badge"
-            >
               {{ orderAmount.consignment }}
             </text>
           </view>
-          <view
+          <view class="items" data-sts="5" @tap="toOrderListPage">
-            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
+        <view class="col-item" @tap="myCollectionHandle">
-          class="col-item"
+          <view v-if="loginResult" class="num">
-          @tap="myCollectionHandle"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
             {{ collectionCount }}
           </view>
-          <view
+          <view v-else class="num">
-            v-else
-            class="num"
-          >
             --
           </view>
           <view class="tit">
             我的收藏
           </view>
         </view>
-        <view
+        <view class="col-item" @tap="handleTips">
-          class="col-item"
+          <view v-if="loginResult" class="num">
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
             5
           </view>
-          <view
+          <view v-else class="num">
-            v-else
-            class="num"
-          >
             --
           </view>
           <view class="tit">
             我的消息
           </view>
         </view>
-        <view
+        <view class="col-item" @tap="handleTips">
-          class="col-item"
+          <view v-if="loginResult" class="num">
-          @tap="handleTips"
-        >
-          <view
-            v-if="loginResult"
-            class="num"
-          >
             3
           </view>
-          <view
+          <view v-else class="num">
-            v-else
-            class="num"
-          >
             --
           </view>
           <view class="tit">
@@ -182,40 +112,49 @@
       </view>
 
       <view class="my-menu">
-        <view
+        <view class="memu-item" @tap="toMemberInfoPage">
-          class="memu-item"
+          <view class="i-name">
-          @tap="toDistCenter"
+            <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
+        <view class="memu-item" @tap="toCouponCenter">
-          class="memu-item"
-          @tap="toCouponCenter"
-        >
           <view class="i-name">
             <image src="@/static/images/icon/getCoupon.png" />
             <text>领券中心</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
+        <view class="memu-item" @tap="toMyCouponPage">
-          class="memu-item"
-          @tap="toMyCouponPage"
-        >
           <view class="i-name">
             <image src="@/static/images/icon/myCoupon.png" />
             <text>我的优惠券</text>
           </view>
           <view class="arrowhead" />
         </view>
-        <view
+        <view class="memu-item" @tap="toAddressList">
-          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
+      <view v-if="isAuthInfo" class="log-out" @tap="logout">
-        v-if="isAuthInfo"
-        class="log-out"
-        @tap="logout"
-      >
         <view class="log-out-n">
           <text>退出登录</text>
         </view>
@@ -258,14 +193,30 @@ onShow(() => {
           method: 'GET',
           data: {}
         })
-      .then(({ 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',
@@ -279,9 +230,12 @@ const toCouponCenter = () => {
     })
   }
   const toMyCouponPage = () => {
-  uni.showToast({
+    /* uni.showToast({
       icon: 'none',
       title: '该功能未开源'
+    }) */
+    uni.navigateTo({
+      url: '/pages/delivery-address/delivery-address'
     })
   }
   const handleTips = () => {
@@ -314,7 +268,9 @@ const showCollectionCount = () => {
         method: 'GET',
         data: {}
       })
-    .then(({ data }) => {
+      .then(({
+        data
+      }) => {
         uni.hideLoading()
         collectionCount.value = data
       })