From df5dddb424b1e9b7444061b5ebeab742484da07d Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Fri, 25 Oct 2024 18:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E3=80=82=E5=88=86=E7=B1=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E3=80=82=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=8B=E5=8D=95=E6=88=90=E5=8A=9F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/comment/add.vue |    3 +-
 pages/index/category.vue    |   26 +-
 pages/order/detail.vue      | 1194 ++++++++++++++++++-----------------
 pages/pay/result.vue        |  524 +++++++--------
 pages/user/wallet/score.vue |   29 +-
 5 files changed, 917 insertions(+), 859 deletions(-)

diff --git a/pages/goods/comment/add.vue b/pages/goods/comment/add.vue
index c57b043..0de2b69 100644
--- a/pages/goods/comment/add.vue
+++ b/pages/goods/comment/add.vue
@@ -80,7 +80,8 @@
       await OrderApi.createOrderItemComment(comment);
     }
     // 都评论好，返回
-    sheep.$router.back();
+    // sheep.$router.back();
+	sheep.$router.redirect('/pages/order/list');
   }
 
   onLoad(async (options) => {
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 6d76912..03ff459 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -150,7 +150,7 @@
       .side-menu-wrap {
         width: 200rpx;
         height: 100%;
-        padding-left: 12rpx;
+        // padding-left: 12rpx;
         background-color: #f6f6f6;
 
         .menu-item {
@@ -161,7 +161,7 @@
 
           .menu-title {
             line-height: 32rpx;
-            font-size: 30rpx;
+            font-size: 23rpx;
             font-weight: 400;
             color: #333;
             margin-left: 28rpx;
@@ -187,16 +187,16 @@
 
           &.menu-item-active {
             background-color: #fff;
-            border-radius: 20rpx 0 0 20rpx;
-
+            // border-radius: 20rpx 0 0 20rpx;
             &::before {
               content: '';
               position: absolute;
-              right: 0;
-              bottom: -20rpx;
-              width: 20rpx;
-              height: 20rpx;
-              background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+              left: 0;
+              bottom: 0;
+              width: 2px;
+              height: 100%;
+              // background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+              background: rgba(236,72,29);
             }
 
             &::after {
@@ -211,10 +211,10 @@
 
             .menu-title {
               font-weight: 600;
-
-              &::before {
-                left: 0;
-              }
+				color:rgba(236,72,29);
+              // &::before {
+              //   left: 0;
+              // }
             }
           }
         }
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 167aaca..de63bd9 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,656 +1,694 @@
 <!-- 订单详情 -->
 <template>
-  <s-layout title="订单详情" class="index-wrap" navbar="inner">
-    <!-- 订单状态 TODO -->
-    <view
-            class="state-box ss-flex-col ss-col-center ss-row-right"
-            :style="[
-        {
-          marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
-          paddingTop: Number(statusBarHeight + 88) + 'rpx',
-        },
-      ]"
-    >
-      <view class="ss-flex ss-m-t-32 ss-m-b-20">
-        <image
-                v-if="
-            state.orderInfo.status_code == 'unpaid' ||
-            state.orderInfo.status === 10 || // 待发货
-            state.orderInfo.status_code == 'nocomment'
-          "
-                class="state-img"
-                :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
-        >
-        </image>
-        <image
-                v-if="
+	<s-layout title="订单详情" class="index-wrap" navbar="normal">
+		<!-- 订单状态 TODO -->
+		<!-- <view class="state-box ss-col-center new-class" :style="[
+		  {
+		    marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+		    paddingTop: Number(statusBarHeight + 88) + 'rpx',
+		  },
+		]"> -->
+		<view class="state-box ss-col-center new-class">
+			<view class="ss-flex ss-m-t-32 ss-m-b-20 ">
+				<!-- 待付款 -->
+				<image v-if=" state.orderInfo.status === 0 " class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/8761518e0fa2e892fa65f9c3f79456a23a4dab1796b7069b8a5482ac79d00811.png">
+				</image>
+				
+				<!-- 待收货 -->
+				<image v-if=" state.orderInfo.status === 20 " class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/5aa87fed5713160eb6e7f2cf8697d426d52abac9ede40a1011e8d3296266487e.png">
+				</image>
+				
+				<!-- 待评价 --> 
+				<image v-if=" state.orderInfo.status === 30 && state.orderInfo.buttons?.includes('comment')" class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/b729e67ba7b6039676a43b28ca855228ed82914f7669482b938e9696ed9cc798.png">
+				</image>
+				<!-- 已完成 -->
+				<image v-if=" state.orderInfo.status === 30 && !state.orderInfo.buttons?.includes('comment')" class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/7b1b2022173b3b6812ad256c836b4c5c67b6aa63a203c7d142ae90802a416e7b.png">
+				</image>
+				
+				<image v-if="
+					state.orderInfo.status_code == 'unpaid' ||
+					state.orderInfo.status === 10 || // 待发货
+					state.orderInfo.status_code == 'nocomment'
+				" class="state-img"
+						src="https://zysc.fjptzykj.com:3000/shangcheng/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png">
+					</image>
+				<image v-if="
             state.orderInfo.status_code == 'completed' ||
             state.orderInfo.status_code == 'refund_agree'
-          "
-                class="state-img"
-                :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
-        >
-        </image>
-        <image
-                v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
-                class="state-img"
-                :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
-        >
-        </image>
-        <image
-                v-if="state.orderInfo.status_code == 'noget'"
-                class="state-img"
-                :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
-        >
-        </image>
-        <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
-      </view>
-      <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
-        {{ formatOrderStatusDescription(state.orderInfo) }}
-      </view>
-    </view>
+          " class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png">
+				</image>
+				<image v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+					class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png">
+				</image>
+				<image v-if="state.orderInfo.status_code == 'noget'" class="state-img"
+					src="https://zysc.fjptzykj.com:3000/shangcheng/b78f86e49f0408b005c79246af63707c86a855b2dd39556f2fdce7653d95b227.png">
+				</image>
+				<!-- <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view> -->
+			</view>
+			<view class="ss-font-26 ss-m-x-20 ">
+				{{ formatOrderStatusDescription(state.orderInfo) }}
+			</view>
+		</view>
 
-    <!-- 收货地址 -->
-    <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
-      <view class="ss-flex ss-col-center">
-        <text class="address-username">
-          {{ state.orderInfo.receiverName }}
-        </text>
-        <text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
-      </view>
-      <view class="address-detail">
-        {{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
-      </view>
-    </view>
+		<!-- 收货地址 -->
+		<view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
 
-    <view
-            class="detail-goods"
-            :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
-    >
-      <!-- 订单信 -->
-      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
-        <view class="order-card">
-          <s-goods-item
-                  @tap="onGoodsDetail(item.spuId)"
-                  :img="item.picUrl"
-                  :title="item.spuName"
-                  :skuText="item.properties.map((property) => property.valueName).join(' ')"
-                  :price="item.price"
-                  :num="item.count"
-          >
-            <template #tool>
-              <view class="ss-flex">
-                <button
-                        class="ss-reset-button apply-btn"
-                        v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
-                        @tap.stop="
+			<uni-section title="" type="line" padding>
+				<uni-steps :options="state.list1" :active="state.active" active-color="rgba(214,68,49)"/>
+			</uni-section>
+
+			<view class="new-address">
+				<view class="ss-flex ss-col-center">
+					<text class="address-username">
+						{{ state.orderInfo.receiverName }}
+					</text>
+					<text class="address-phone">{{ state.orderInfo.receiverMobile }}</text>
+				</view>
+				<view class="address-detail">
+					{{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-goods" :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]">
+			<!-- 订单信 -->
+			<view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
+				<view class="order-card">
+					<s-goods-item @tap="onGoodsDetail(item.spuId)" :img="item.picUrl" :title="item.spuName"
+						:skuText="item.properties.map((property) => property.valueName).join(' ')" :price="item.price"
+						:num="item.count">
+						<template #tool>
+							<view class="ss-flex">
+								<button class="ss-reset-button apply-btn"
+									v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
+									@tap.stop="
                     sheep.$router.go('/pages/order/aftersale/apply', {
                       orderId: state.orderInfo.id,
                       itemId: item.id,
                     })
-                  "
-                >
-                  申请售后
-                </button>
-                <button
-                        class="ss-reset-button apply-btn"
-                        v-if="item.afterSaleStatus === 10"
-                        @tap.stop="
+                  ">
+									申请售后
+								</button>
+								<button class="ss-reset-button apply-btn" v-if="item.afterSaleStatus === 10" @tap.stop="
                     sheep.$router.go('/pages/order/aftersale/detail', {
                       id: item.afterSaleId,
                     })
-                  "
-                >
-                  退款中
-                </button>
-                <button
-                        class="ss-reset-button apply-btn"
-                        v-if="item.afterSaleStatus === 20"
-                        @tap.stop="
+                  ">
+									退款中
+								</button>
+								<button class="ss-reset-button apply-btn" v-if="item.afterSaleStatus === 20" @tap.stop="
                     sheep.$router.go('/pages/order/aftersale/detail', {
                       id: item.afterSaleId,
                     })
-                  "
-                >
-                  退款成功
-                </button>
-              </view>
-            </template>
-            <template #priceSuffix>
-              <button class="ss-reset-button tag-btn" v-if="item.status_text">
-                {{ item.status_text }}
-              </button>
-            </template>
-          </s-goods-item>
-        </view>
-      </view>
-    </view>
+                  ">
+									退款成功
+								</button>
+							</view>
+						</template>
+						<template #priceSuffix>
+							<button class="ss-reset-button tag-btn" v-if="item.status_text">
+								{{ item.status_text }}
+							</button>
+						</template>
+					</s-goods-item>
+				</view>
+			</view>
+		</view>
 
-    <!--  自提核销  -->
-    <PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
+		<!--  自提核销  -->
+		<PickUpVerify :order-info="state.orderInfo" :systemStore="systemStore" ref="pickUpVerifyRef"></PickUpVerify>
 
-    <!-- 订单信息 -->
-    <view class="notice-box">
-      <view class="notice-box__content">
-        <view class="notice-item--center">
-          <view class="ss-flex ss-flex-1">
-            <text class="title">订单编号：</text>
-            <text class="detail">{{ state.orderInfo.no }}</text>
-          </view>
-          <button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
-        </view>
-        <view class="notice-item">
-          <text class="title">下单时间：</text>
-          <text class="detail">
-            {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
-          </text>
-        </view>
-        <view class="notice-item" v-if="state.orderInfo.payTime">
-          <text class="title">支付时间：</text>
-          <text class="detail">
-            {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
-          </text>
-        </view>
-        <view class="notice-item">
-          <text class="title">支付方式：</text>
-          <text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
-        </view>
-      </view>
-    </view>
+		<!-- 订单信息 -->
+		<view class="notice-box">
+			<view class="notice-box__content">
+				<view class="notice-item--center">
+					<view class="ss-flex ss-flex-1">
+						<text class="title">订单编号：</text>
+						<text class="detail">{{ state.orderInfo.no }}</text>
+					</view>
+					<button class="ss-reset-button copy-btn" @tap="onCopy">复制</button>
+				</view>
+				<view class="notice-item">
+					<text class="title">下单时间：</text>
+					<text class="detail">
+						{{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+					</text>
+				</view>
+				<view class="notice-item" v-if="state.orderInfo.payTime">
+					<text class="title">支付时间：</text>
+					<text class="detail">
+						{{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+					</text>
+				</view>
+				<view class="notice-item">
+					<text class="title">支付方式：</text>
+					<text class="detail">{{ state.orderInfo.payChannelName || '-' }}</text>
+				</view>
+			</view>
+		</view>
 
-    <!-- 价格信息 -->
-    <view class="order-price-box">
-      <view class="notice-item ss-flex ss-row-between">
-        <text class="title">商品总额</text>
-        <view class="ss-flex">
-          <text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
-        </view>
-      </view>
-      <view class="notice-item ss-flex ss-row-between">
-        <text class="title">运费</text>
-        <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
-      </view>
-      <!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
-        <text class="title">优惠劵金额</text>
-        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
-      </view>
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
-        <text class="title">积分抵扣</text>
-        <text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
-      </view>
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
-        <text class="title">活动优惠</text>
-        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
-      </view>
-      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
-        <text class="title">会员优惠</text>
-        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
-      </view>
-      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
-        <text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
-        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
-      </view>
-      <view
-              class="notice-item all-rpice-item ss-flex ss-m-t-20"
-              v-if="state.orderInfo.refundPrice > 0"
-      >
-        <text class="title">已退款</text>
-        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
-      </view>
-    </view>
+		<!-- 价格信息 -->
+		<view class="order-price-box">
+			<view class="notice-item ss-flex ss-row-between">
+				<text class="title">商品总额</text>
+				<view class="ss-flex">
+					<text class="detail">￥{{ fen2yuan(state.orderInfo.totalPrice) }}</text>
+				</view>
+			</view>
+			<view class="notice-item ss-flex ss-row-between">
+				<text class="title">运费</text>
+				<text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
+			</view>
+			<!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
+			<view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+				<text class="title">优惠劵金额</text>
+				<text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+			</view>
+			<view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.pointPrice > 0">
+				<text class="title">积分抵扣</text>
+				<text class="detail">-¥{{ fen2yuan(state.orderInfo.pointPrice) }}</text>
+			</view>
+			<view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
+				<text class="title">活动优惠</text>
+				<text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
+			</view>
+			<view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+				<text class="title">会员优惠</text>
+				<text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+			</view>
+			<view class="notice-item all-rpice-item ss-flex ss-m-t-20">
+				<text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
+				<text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
+			</view>
+			<view class="notice-item all-rpice-item ss-flex ss-m-t-20" v-if="state.orderInfo.refundPrice > 0">
+				<text class="title">已退款</text>
+				<text class="detail all-price">￥{{ fen2yuan(state.orderInfo.refundPrice) }}</text>
+			</view>
+		</view>
 
-    <!-- 底部按钮 -->
-    <!-- TODO: 查看物流、等待成团、评价完后返回页面没刷新页面 -->
-    <su-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
-      <view class="footer-box ss-flex ss-col-center ss-row-right">
-        <button
-                class="ss-reset-button cancel-btn"
-                v-if="state.orderInfo.buttons?.includes('cancel')"
-                @tap="onCancel(state.orderInfo.id)"
-        >
-          取消订单
-        </button>
-        <button
-                class="ss-reset-button pay-btn ui-BG-Main-Gradient"
-                v-if="state.orderInfo.buttons?.includes('pay')"
-                @tap="onPay(state.orderInfo.payOrderId)"
-        >
-          继续支付
-        </button>
-        <button
-                class="ss-reset-button cancel-btn"
-                v-if="state.orderInfo.buttons?.includes('combination')"
-                @tap="
+		<!-- 底部按钮 -->
+		<!-- TODO: 查看物流、等待成团、评价完后返回页面没刷新页面 -->
+		<su-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
+			<view class="footer-box ss-flex ss-col-center ss-row-right">
+				<button class="ss-reset-button cancel-btn" v-if="state.orderInfo.buttons?.includes('cancel')"
+					@tap="onCancel(state.orderInfo.id)">
+					取消订单
+				</button>
+				<button class="ss-reset-button pay-btn ui-BG-Main-Gradient"
+					v-if="state.orderInfo.buttons?.includes('pay')" @tap="onPay(state.orderInfo.payOrderId)">
+					继续支付
+				</button>
+				<button class="ss-reset-button cancel-btn" v-if="state.orderInfo.buttons?.includes('combination')" @tap="
             sheep.$router.go('/pages/activity/groupon/detail', {
               id: state.orderInfo.combinationRecordId,
             })
-          "
-        >
-          拼团详情
-        </button>
-        <button
-                class="ss-reset-button cancel-btn"
-                v-if="state.orderInfo.buttons?.includes('express')"
-                @tap="onExpress(state.orderInfo.id)"
-        >
-          查看物流
-        </button>
-        <button
-                class="ss-reset-button cancel-btn"
-                v-if="state.orderInfo.buttons?.includes('confirm')"
-                @tap="onConfirm(state.orderInfo.id)"
-        >
-          确认收货
-        </button>
-        <button
-                class="ss-reset-button cancel-btn"
-                v-if="state.orderInfo.buttons?.includes('comment')"
-                @tap="onComment(state.orderInfo.id)"
-        >
-          评价
-        </button>
-      </view>
-    </su-fixed>
-  </s-layout>
+          ">
+					拼团详情
+				</button>
+				<button class="ss-reset-button cancel-btn" v-if="state.orderInfo.buttons?.includes('express')"
+					@tap="onExpress(state.orderInfo.id)">
+					查看物流
+				</button>
+				<button class="ss-reset-button cancel-btn" v-if="state.orderInfo.buttons?.includes('confirm')"
+					@tap="onConfirm(state.orderInfo.id)">
+					确认收货
+				</button>
+				<button class="ss-reset-button cancel-btn" v-if="state.orderInfo.buttons?.includes('comment')"
+					@tap="onComment(state.orderInfo.id)">
+					评价
+				</button>
+			</view>
+		</su-fixed>
+	</s-layout>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
-  import { reactive, ref } from 'vue';
-  import { isEmpty } from 'lodash-es';
-  import {
-    fen2yuan,
-    formatOrderStatus,
-    formatOrderStatusDescription,
-    handleOrderButtons,
-  } from '@/sheep/hooks/useGoods';
-  import OrderApi from '@/sheep/api/trade/order';
-  import DeliveryApi from '@/sheep/api/trade/delivery';
-  import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		reactive,
+		ref
+	} from 'vue';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import {
+		fen2yuan,
+		formatOrderStatus,
+		formatOrderStatusDescription,
+		handleOrderButtons,
+	} from '@/sheep/hooks/useGoods';
+	import OrderApi from '@/sheep/api/trade/order';
+	import DeliveryApi from '@/sheep/api/trade/delivery';
+	import PickUpVerify from '@/pages/order/pickUpVerify.vue';
 
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
 
-  const state = reactive({
-    orderInfo: {},
-    merchantTradeNo: '', // 商户订单号
-    comeinType: '', // 进入订单详情的来源类型
-  });
+	const state = reactive({
+		orderInfo: {},
+		merchantTradeNo: '', // 商户订单号
+		comeinType: '', // 进入订单详情的来源类型
+		list1: [{
+			title: '待付款'
+		}, {
+			title: '待发货'
+		}, {
+			title: '待收货'
+		}
+		, {
+			title: '待评价'
+		}
+		, {
+			title: '已完成'
+		}], // 订单状态步骤条
+		active:0
+	});
 
-  // ========== 门店自提（核销） ==========
-  const systemStore = ref({}); // 门店信息
+	// ========== 门店自提（核销） ==========
+	const systemStore = ref({}); // 门店信息
 
-  // 复制
-  const onCopy = () => {
-    sheep.$helper.copyText(state.orderInfo.no);
-  };
+	// 复制
+	const onCopy = () => {
+		sheep.$helper.copyText(state.orderInfo.no);
+	};
 
-  // 去支付
-  function onPay(payOrderId) {
-    sheep.$router.go('/pages/pay/index', {
-      id: payOrderId,
-    });
-  }
+	// 去支付
+	function onPay(payOrderId) {
+		sheep.$router.go('/pages/pay/index', {
+			id: payOrderId,
+		});
+	}
 
-  // 查看商品
-  function onGoodsDetail(id) {
-    sheep.$router.go('/pages/goods/index', {
-      id,
-    });
-  }
+	// 查看商品
+	function onGoodsDetail(id) {
+		sheep.$router.go('/pages/goods/index', {
+			id,
+		});
+	}
 
-  // 取消订单
-  async function onCancel(orderId) {
-    uni.showModal({
-      title: '提示',
-      content: '确定要取消订单吗?',
-      success: async function(res) {
-        if (!res.confirm) {
-          return;
-        }
-        const { code } = await OrderApi.cancelOrder(orderId);
-        if (code === 0) {
-          await getOrderDetail(orderId);
-        }
-      },
-    });
-  }
+	// 取消订单
+	async function onCancel(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要取消订单吗?',
+			success: async function(res) {
+				if (!res.confirm) {
+					return;
+				}
+				const {
+					code
+				} = await OrderApi.cancelOrder(orderId);
+				if (code === 0) {
+					await getOrderDetail(orderId);
+				}
+			},
+		});
+	}
 
-  // 查看物流
-  async function onExpress(id) {
-    sheep.$router.go('/pages/order/express/log', {
-      id,
-    });
-  }
+	// 查看物流
+	async function onExpress(id) {
+		sheep.$router.go('/pages/order/express/log', {
+			id,
+		});
+	}
 
-  // 确认收货 TODO 芋艿：待测试
-  async function onConfirm(orderId, ignore = false) {
-    // 需开启确认收货组件
-    // todo: 芋艿：待接入微信
-    // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
-    // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-    let isOpenBusinessView = true;
-    if (
-            sheep.$platform.name === 'WechatMiniProgram' &&
-            !isEmpty(state.orderInfo.wechat_extra_data) &&
-            isOpenBusinessView &&
-            !ignore
-    ) {
-      mpConfirm(orderId);
-      return;
-    }
+	// 确认收货 TODO 芋艿：待测试
+	async function onConfirm(orderId, ignore = false) {
+		// 需开启确认收货组件
+		// todo: 芋艿：待接入微信
+		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+		let isOpenBusinessView = true;
+		if (
+			sheep.$platform.name === 'WechatMiniProgram' &&
+			!isEmpty(state.orderInfo.wechat_extra_data) &&
+			isOpenBusinessView &&
+			!ignore
+		) {
+			mpConfirm(orderId);
+			return;
+		}
 
-    // 正常的确认收货流程
-    const { code } = await OrderApi.receiveOrder(orderId);
-    if (code === 0) {
-      await getOrderDetail(orderId);
-    }
-  }
+		// 正常的确认收货流程
+		const {
+			code
+		} = await OrderApi.receiveOrder(orderId);
+		if (code === 0) {
+			await getOrderDetail(orderId);
+		}
+	}
 
-  // #ifdef MP-WEIXIN
-  // 小程序确认收货组件
-  function mpConfirm(orderId) {
-    if (!wx.openBusinessView) {
-      sheep.$helper.toast(`请升级微信版本`);
-      return;
-    }
-    wx.openBusinessView({
-      businessType: 'weappOrderConfirm',
-      extraData: {
-        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
-        transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
-      },
-      success(response) {
-        console.log('success:', response);
-        if (response.errMsg === 'openBusinessView:ok') {
-          if (response.extraData.status === 'success') {
-            onConfirm(orderId, true);
-          }
-        }
-      },
-      fail(error) {
-        console.log('error:', error);
-      },
-      complete(result) {
-        console.log('result:', result);
-      },
-    });
-  }
+	// #ifdef MP-WEIXIN
+	// 小程序确认收货组件
+	function mpConfirm(orderId) {
+		if (!wx.openBusinessView) {
+			sheep.$helper.toast(`请升级微信版本`);
+			return;
+		}
+		wx.openBusinessView({
+			businessType: 'weappOrderConfirm',
+			extraData: {
+				merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+				transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+			},
+			success(response) {
+				console.log('success:', response);
+				if (response.errMsg === 'openBusinessView:ok') {
+					if (response.extraData.status === 'success') {
+						onConfirm(orderId, true);
+					}
+				}
+			},
+			fail(error) {
+				console.log('error:', error);
+			},
+			complete(result) {
+				console.log('result:', result);
+			},
+		});
+	}
 
-  // #endif
+	// #endif
 
-  // 评价
-  function onComment(id) {
-    sheep.$router.go('/pages/goods/comment/add', {
-      id,
-    });
-  }
+	// 评价
+	function onComment(id) {
+		sheep.$router.go('/pages/goods/comment/add', {
+			id,
+		});
+	}
 
-  const pickUpVerifyRef = ref();
+	const pickUpVerifyRef = ref();
 
-  async function getOrderDetail(id) {
-    // 对详情数据进行适配
-    let res;
-    if (state.comeinType === 'wechat') {
-      // TODO 芋艿：微信场景下
-      res = await OrderApi.getOrder(id, {
-        merchant_trade_no: state.merchantTradeNo,
-      });
-    } else {
-      res = await OrderApi.getOrder(id);
-    }
-    if (res.code === 0) {
-      state.orderInfo = res.data;
-      handleOrderButtons(state.orderInfo);
-      // 配送方式：门店自提
-      if (res.data.pickUpStoreId) {
-        const { data } = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
-        systemStore.value = data || {};
-      }
-      if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
-        pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
-      }
-    } else {
-      sheep.$router.back();
-    }
-  }
+	async function getOrderDetail(id) {
+		// 对详情数据进行适配
+		let res;
+		if (state.comeinType === 'wechat') {
+			// TODO 芋艿：微信场景下
+			res = await OrderApi.getOrder(id, {
+				merchant_trade_no: state.merchantTradeNo,
+			});
+		} else {
+			res = await OrderApi.getOrder(id);
+		}
+		if (res.code === 0) {
+			state.orderInfo = res.data;
+			
+			
+			
+			handleOrderButtons(state.orderInfo);
+			// 配送方式：门店自提
+			if (res.data.pickUpStoreId) {
+				const {
+					data
+				} = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+				systemStore.value = data || {};
+			}
+			if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+				pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+			}
+			
+			console.log("打印微信----", state.orderInfo.buttons)
+			
+			if(res.data.status == 30 && res.data.buttons?.includes('comment')){
+				state.active = 3;
+			}else{
+				switch (res.data.status) {
+					case 10:
+						state.active = 1;
+						break;
+					case 30:
+						if(!state.orderInfo.buttons?.includes('comment')){
+							state.active = 4;
+						}
+						break;
+					case 20:
+						state.active = 2;
+						break;
+					case 0:
+						state.active = 0;
+						break;
+				}
+			}
+		} else {
+			sheep.$router.back();
+		}
+	}
 
-  onLoad(async (options) => {
-    let id = 0;
-    if (options.id) {
-      id = options.id;
-    }
-    // TODO 芋艿：下面两个变量，后续接入
-    state.comeinType = options.comein_type;
-    if (state.comeinType === 'wechat') {
-      state.merchantTradeNo = options.merchant_trade_no;
-    }
-    await getOrderDetail(id);
-  });
+	onLoad(async (options) => {
+		let id = 0;
+		if (options.id) {
+			id = options.id;
+		}
+		// TODO 芋艿：下面两个变量，后续接入
+		state.comeinType = options.comein_type;
+		if (state.comeinType === 'wechat') {
+			state.merchantTradeNo = options.merchant_trade_no;
+		}
+		await getOrderDetail(id);
+	});
 </script>
 
 <style lang="scss" scoped>
-  .score-img {
-    width: 36rpx;
-    height: 36rpx;
-    margin: 0 4rpx;
-  }
+	.new-class {
+		display: flex;
+		// justify-content: center;
+		padding: 11px 29px;
+	}
+	.new-address{
+		padding-top:30px;
+		padding-left:15px;
+	}
 
-  .apply-btn {
-    width: 140rpx;
-    height: 50rpx;
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    border: 2rpx solid #dcdcdc;
-    line-height: normal;
-    margin-left: 16rpx;
-  }
+	.score-img {
+		width: 36rpx;
+		height: 36rpx;
+		margin: 0 4rpx;
+	}
 
-  .state-box {
-    color: rgba(#fff, 0.9);
-    width: 100%;
-    background: v-bind(headerBg) no-repeat,
-    linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    background-size: 750rpx 100%;
-    box-sizing: border-box;
+	.apply-btn {
+		width: 140rpx;
+		height: 50rpx;
+		border-radius: 25rpx;
+		font-size: 24rpx;
+		border: 2rpx solid #dcdcdc;
+		line-height: normal;
+		margin-left: 16rpx;
+	}
 
-    .state-img {
-      width: 60rpx;
-      height: 60rpx;
-      margin-right: 20rpx;
-    }
-  }
+	.state-box {
+		color: rgba(#fff, 0.9);
+		width: 100%;
+		// background: v-bind(headerBg) no-repeat,
+		// linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		background: rgba(214, 68, 49);
+		background-size: 750rpx 100%;
+		box-sizing: border-box;
 
-  .order-address-box {
-    background-color: #fff;
-    border-radius: 10rpx;
-    margin: -50rpx 20rpx 16rpx 20rpx;
-    padding: 44rpx 34rpx 42rpx 20rpx;
-    font-size: 30rpx;
-    box-sizing: border-box;
-    font-weight: 500;
-    color: rgba(51, 51, 51, 1);
+		.state-img {
+			width: 60rpx;
+			height: 60rpx;
+			margin-right: 20rpx;
+		}
+	}
 
-    .address-username {
-      margin-right: 20rpx;
-    }
+	.order-address-box {
+		background-color: #fff;
+		border-radius: 10rpx;
+		// margin: 15px 20rpx 16rpx 20rpx;
+		margin-bottom:10px;
+		padding: 44rpx 0 42rpx 0;
+		font-size: 30rpx;
+		box-sizing: border-box;
+		font-weight: 500;
+		color: rgba(51, 51, 51, 1);
 
-    .address-detail {
-      font-size: 26rpx;
-      font-weight: 500;
-      color: rgba(153, 153, 153, 1);
-      margin-top: 20rpx;
-    }
-  }
+		.address-username {
+			margin-right: 20rpx;
+		}
 
-  .detail-goods {
-    border-radius: 10rpx;
-    margin: 0 20rpx 20rpx 20rpx;
+		.address-detail {
+			font-size: 26rpx;
+			font-weight: 500;
+			color: rgba(153, 153, 153, 1);
+			margin-top: 20rpx;
+		}
+	}
 
-    .order-list {
-      margin-bottom: 20rpx;
-      background-color: #fff;
+	.detail-goods {
+		border-radius: 10rpx;
+		margin: 0 0 20rpx 0;
 
-      .order-card {
-        padding: 20rpx 0;
+		.order-list {
+			margin-bottom: 20rpx;
+			background-color: #fff;
 
-        .order-sku {
-          font-size: 24rpx;
+			.order-card {
+				padding: 20rpx 0;
 
-          font-weight: 400;
-          color: rgba(153, 153, 153, 1);
-          width: 450rpx;
-          margin-bottom: 20rpx;
+				.order-sku {
+					font-size: 24rpx;
 
-          .order-num {
-            margin-right: 10rpx;
-          }
-        }
+					font-weight: 400;
+					color: rgba(153, 153, 153, 1);
+					width: 450rpx;
+					margin-bottom: 20rpx;
 
-        .tag-btn {
-          margin-left: 16rpx;
-          font-size: 24rpx;
-          height: 36rpx;
-          color: var(--ui-BG-Main);
-          border: 2rpx solid var(--ui-BG-Main);
-          border-radius: 14rpx;
-          padding: 0 4rpx;
-        }
-      }
-    }
-  }
+					.order-num {
+						margin-right: 10rpx;
+					}
+				}
 
-  // 订单信息。
-  .notice-box {
-    background: #fff;
-    border-radius: 10rpx;
-    margin: 0 20rpx 20rpx 20rpx;
+				.tag-btn {
+					margin-left: 16rpx;
+					font-size: 24rpx;
+					height: 36rpx;
+					color: var(--ui-BG-Main);
+					border: 2rpx solid var(--ui-BG-Main);
+					border-radius: 14rpx;
+					padding: 0 4rpx;
+				}
+			}
+		}
+	}
 
-    .notice-box__head {
-      font-size: 30rpx;
+	// 订单信息。
+	.notice-box {
+		background: #fff;
+		border-radius: 10rpx;
+		margin: 0 0 20rpx 0;
 
-      font-weight: 500;
-      color: rgba(51, 51, 51, 1);
-      line-height: 80rpx;
-      border-bottom: 1rpx solid #dfdfdf;
-      padding: 0 25rpx;
-    }
+		.notice-box__head {
+			font-size: 30rpx;
 
-    .notice-box__content {
-      padding: 20rpx;
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1);
+			line-height: 80rpx;
+			border-bottom: 1rpx solid #dfdfdf;
+			padding: 0 25rpx;
+		}
 
-      .self-pickup-box {
-        width: 100%;
+		.notice-box__content {
+			padding: 20rpx;
 
-        .self-pickup--img {
-          width: 200rpx;
-          height: 200rpx;
-          margin: 40rpx 0;
-        }
-      }
-    }
+			.self-pickup-box {
+				width: 100%;
 
-    .notice-item,
-    .notice-item--center {
-      display: flex;
-      align-items: center;
-      line-height: normal;
-      margin-bottom: 24rpx;
+				.self-pickup--img {
+					width: 200rpx;
+					height: 200rpx;
+					margin: 40rpx 0;
+				}
+			}
+		}
 
-      .title {
-        font-size: 28rpx;
-        color: #999;
-      }
+		.notice-item,
+		.notice-item--center {
+			display: flex;
+			align-items: center;
+			line-height: normal;
+			margin-bottom: 24rpx;
 
-      .detail {
-        font-size: 28rpx;
-        color: #333;
-        flex: 1;
-      }
-    }
-  }
+			.title {
+				font-size: 28rpx;
+				color: #999;
+			}
 
-  .copy-btn {
-    width: 100rpx;
-    line-height: 50rpx;
-    border-radius: 25rpx;
-    padding: 0;
-    background: rgba(238, 238, 238, 1);
-    font-size: 22rpx;
-    font-weight: 400;
-    color: rgba(51, 51, 51, 1);
-  }
+			.detail {
+				font-size: 28rpx;
+				color: #333;
+				flex: 1;
+			}
+		}
+	}
 
-  // 订单价格信息
-  .order-price-box {
-    background-color: #fff;
-    border-radius: 10rpx;
-    padding: 20rpx;
-    margin: 0 20rpx 20rpx 20rpx;
+	.copy-btn {
+		width: 100rpx;
+		line-height: 50rpx;
+		border-radius: 25rpx;
+		padding: 0;
+		background: rgba(238, 238, 238, 1);
+		font-size: 22rpx;
+		font-weight: 400;
+		color: rgba(51, 51, 51, 1);
+	}
 
-    .notice-item {
-      line-height: 70rpx;
+	// 订单价格信息
+	.order-price-box {
+		background-color: #fff;
+		border-radius: 10rpx;
+		padding: 20rpx;
+		margin: 0 0 20rpx 0;
 
-      .title {
-        font-size: 28rpx;
-        color: #999;
-      }
+		.notice-item {
+			line-height: 70rpx;
 
-      .detail {
-        font-size: 28rpx;
-        color: #333;
-        font-family: OPPOSANS;
-      }
-    }
+			.title {
+				font-size: 28rpx;
+				color: #999;
+			}
 
-    .all-rpice-item {
-      justify-content: flex-end;
-      align-items: center;
+			.detail {
+				font-size: 28rpx;
+				color: #333;
+				font-family: OPPOSANS;
+			}
+		}
 
-      .title {
-        font-size: 26rpx;
-        font-weight: 500;
-        color: #333333;
-        line-height: normal;
-      }
+		.all-rpice-item {
+			justify-content: flex-end;
+			align-items: center;
 
-      .all-price {
-        font-size: 26rpx;
-        font-family: OPPOSANS;
-        line-height: normal;
-        color: $red;
-      }
-    }
-  }
+			.title {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #333333;
+				line-height: normal;
+			}
 
-  // 底部
-  .footer-box {
-    height: 100rpx;
-    width: 100%;
-    box-sizing: border-box;
-    border-radius: 10rpx;
-    padding-right: 20rpx;
+			.all-price {
+				font-size: 26rpx;
+				font-family: OPPOSANS;
+				line-height: normal;
+				color: $red;
+			}
+		}
+	}
 
-    .cancel-btn {
-      width: 160rpx;
-      height: 60rpx;
-      background: #eeeeee;
-      border-radius: 30rpx;
-      margin-right: 20rpx;
-      font-size: 26rpx;
-      font-weight: 400;
-      color: #333333;
-    }
+	// 底部
+	.footer-box {
+		height: 100rpx;
+		width: 100%;
+		box-sizing: border-box;
+		border-radius: 10rpx;
+		padding-right: 20rpx;
 
-    .pay-btn {
-      width: 160rpx;
-      height: 60rpx;
-      font-size: 26rpx;
-      border-radius: 30rpx;
-      font-weight: 500;
-      color: #fff;
-    }
-  }
-</style>
+		.cancel-btn {
+			width: 160rpx;
+			height: 60rpx;
+			background: #eeeeee;
+			border-radius: 30rpx;
+			margin-right: 20rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #333333;
+		}
+
+		.pay-btn {
+			width: 160rpx;
+			height: 60rpx;
+			font-size: 26rpx;
+			border-radius: 30rpx;
+			font-weight: 500;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 8294371..5af8634 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -1,287 +1,287 @@
 <!-- 支付结果页面 -->
 <template>
-  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
-    <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
-      <!-- 信息展示 -->
-      <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
-      <image
-        class="pay-img ss-m-b-30"
-        v-if="payResult === 'success'"
-        :src="sheep.$url.static('/static/img/shop/order/order_pay_success.gif')"
-      />
-      <image
-        class="pay-img ss-m-b-30"
-        v-if="['failed', 'closed'].includes(payResult)"
-        :src="sheep.$url.static('/static/img/shop/order/order_paty_fail.gif')"
-      />
-      <view class="tip-text ss-m-b-30" v-if="payResult === 'success'">支付成功</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult === 'failed'">支付失败</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult === 'closed'">该订单已关闭</view>
-      <view class="tip-text ss-m-b-30" v-if="payResult === 'waiting'">检测支付结果...</view>
-      <view class="pay-total-num ss-flex" v-if="payResult === 'success'">
-        <view>￥{{ fen2yuan(state.orderInfo.price) }}</view>
-      </view>
-
-      <!-- 操作区 -->
-      <view class="btn-box ss-flex ss-row-center ss-m-t-50">
-        <button class="back-btn ss-reset-button" @tap="sheep.$router.go('/pages/index/index')">
-          返回首页
-        </button>
-        <button
-          class="check-btn ss-reset-button"
-          v-if="payResult === 'failed'"
-          @tap="
-            sheep.$router.redirect('/pages/pay/index', { id: state.id, orderType: state.orderType })
-          "
-        >
-          重新支付
-        </button>
-        <button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
-          查看订单
-        </button>
-        <!-- TODO 芋艿：拼团接入 -->
-        <button
-          class="check-btn ss-reset-button"
-          v-if="payResult === 'success' && state.tradeOrder.type === 3"
-          @tap="sheep.$router.redirect('/pages/activity/groupon/order')"
-        >
-          我的拼团
-        </button>
-      </view>
-
-      <!-- TODO 芋艿：订阅 -->
-      <!-- #ifdef MP -->
-      <view class="subscribe-box ss-flex ss-m-t-44">
-        <image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
-        <view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
-        <view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
-      </view>
-      <!-- #endif -->
-    </view>
-  </s-layout>
+	<s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+		<view class="main">
+			<image
+				src="https://zysc.fjptzykj.com:3000/shangcheng/7bab925772a5b878b75dcc35e5ebd1d6e6c2e776752554526a71ecd1371c24db.png"
+				class="img" mode=""></image>
+			<view class="title" v-if="payResult === 'success'">订单支付成功</view>
+			<view class="title" v-if="payResult === 'failed'">支付失败</view>
+			<view class="title" v-if="payResult === 'closed'">该订单已关闭</view>
+			<view class="title" v-if="payResult === 'waiting'">检测支付结果...</view>
+			<!-- <view class="title">订单支付成功</view> -->
+			<view class="fgx"></view>
+			<view class="ddxx">
+				<view class="l">
+					订单号
+				</view>
+				<view class="r">
+					{{ state.orderInfo.no }}
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					下单时间
+				</view>
+				<view class="r">
+					{{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					支付方式
+				</view>
+				<view class="r">
+					支付余额
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					支付余额
+				</view>
+				<view class="r">
+					￥{{ fen2yuan(state.orderInfo.price) }}
+				</view>
+			</view>
+			<view class="fgx"></view>
+			<view class="ck-detail" v-if="payResult === 'failed'" @tap="sheep.$router.redirect('/pages/pay/index', { id: state.id, orderType: state.orderType })">
+				重新支付
+			</view>
+			<view class="ck-detail" v-if="payResult === 'success' && state.tradeOrder.type === 3" @tap="sheep.$router.redirect('/pages/activity/groupon/order')">
+				我的拼团
+			</view>
+			<view class="ck-detail" v-if="payResult === 'success'" @tap="onOrder">
+				查看订单
+			</view>
+			<view class="bk-home" @click="sheep.$router.go('/pages/index/index');">
+				返回首页
+			</view>
+			
+			<!-- TODO 芋艿：订阅 -->
+			<!-- #ifdef MP -->
+			<view class="subscribe-box ss-flex ss-m-t-44">
+				<image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
+				<view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
+				<view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
+			</view>
+			<!-- #endif -->
+		</view>
+	</s-layout>
 </template>
 
 <script setup>
-  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
-  import { reactive, computed } from 'vue';
-  import { isEmpty } from 'lodash';
-  import sheep from '@/sheep';
-  import PayOrderApi from '@/sheep/api/pay/order';
-  import { fen2yuan } from '../../sheep/hooks/useGoods';
-  import OrderApi from '@/sheep/api/trade/order';
+	import {
+		onLoad,
+		onHide,
+		onShow
+	} from '@dcloudio/uni-app';
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import {
+		isEmpty
+	} from 'lodash';
+	import sheep from '@/sheep';
+	import PayOrderApi from '@/sheep/api/pay/order';
+	import {
+		fen2yuan
+	} from '../../sheep/hooks/useGoods';
+	import OrderApi from '@/sheep/api/trade/order';
 
-  const state = reactive({
-    id: 0, // 支付单号
-    orderType: 'goods', // 订单类型
-    result: 'unpaid', // 支付状态
-    orderInfo: {}, // 支付订单信息
-    tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
-    counter: 0, // 获取结果次数
-  });
+	const state = reactive({
+		id: 0, // 支付单号
+		orderType: 'goods', // 订单类型
+		result: 'unpaid', // 支付状态
+		orderInfo: {}, // 支付订单信息
+		tradeOrder: {}, // 商品订单信息，只有在 orderType 为 goods 才会请求。目的：【我的拼团】按钮的展示
+		counter: 0, // 获取结果次数
+	});
 
-  // 支付结果 result => payResult
-  const payResult = computed(() => {
-    if (state.result === 'unpaid') {
-      return 'waiting';
-    }
-    if (state.result === 'paid') {
-      return 'success';
-    }
-    if (state.result === 'failed') {
-      return 'failed';
-    }
-    if (state.result === 'closed') {
-      return 'closed';
-    }
-  });
+	// 支付结果 result => payResult
+	const payResult = computed(() => {
+		if (state.result === 'unpaid') {
+			return 'waiting';
+		}
+		if (state.result === 'paid') {
+			return 'success';
+		}
+		if (state.result === 'failed') {
+			return 'failed';
+		}
+		if (state.result === 'closed') {
+			return 'closed';
+		}
+	});
 
-  // 获得订单信息
-  async function getOrderInfo(id) {
-    state.counter++;
-    // 1. 加载订单信息
-    const { data, code } = await PayOrderApi.getOrder(id);
-    if (code === 0) {
-      state.orderInfo = data;
-      if (!state.orderInfo || state.orderInfo.status === 30) {
-        // 支付关闭
-        state.result = 'closed';
-        return;
-      }
-      if (state.orderInfo.status !== 0) {
-        // 非待支付，可能是已支付，可能是已退款
-        state.result = 'paid';
-        // #ifdef MP
-        subscribeMessage();
-        // #endif
-        // 特殊：获得商品订单信息
-        if (state.orderType === 'goods') {
-          const { data, code } = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
-          if (code === 0) {
-            state.tradeOrder = data;
-          }
-        }
-        return;
-      }
-    }
-    // 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
-    if (state.counter < 3 && state.result === 'unpaid') {
-      setTimeout(() => {
-        getOrderInfo(id);
-      }, 1500);
-    }
-    // 2.2 情况二：超过三次检测才判断为支付失败
-    if (state.counter >= 3) {
-      state.result = 'failed';
-    }
-  }
+	// 获得订单信息
+	async function getOrderInfo(id) {
+		state.counter++;
+		// 1. 加载订单信息
+		const {
+			data,
+			code
+		} = await PayOrderApi.getOrder(id);
+		if (code === 0) {
+			state.orderInfo = data;
+			if (!state.orderInfo || state.orderInfo.status === 30) {
+				// 支付关闭
+				state.result = 'closed';
+				return;
+			}
+			if (state.orderInfo.status !== 0) {
+				// 非待支付，可能是已支付，可能是已退款
+				state.result = 'paid';
+				// #ifdef MP
+				subscribeMessage();
+				// #endif
+				// 特殊：获得商品订单信息
+				if (state.orderType === 'goods') {
+					const {
+						data,
+						code
+					} = await OrderApi.getOrder(state.orderInfo.merchantOrderId);
+					if (code === 0) {
+						state.tradeOrder = data;
+					}
+				}
+				return;
+			}
+		}
+		// 2.1 情况三一：未支付，且轮询次数小于三次，则继续轮询
+		if (state.counter < 3 && state.result === 'unpaid') {
+			setTimeout(() => {
+				getOrderInfo(id);
+			}, 1500);
+		}
+		// 2.2 情况二：超过三次检测才判断为支付失败
+		if (state.counter >= 3) {
+			state.result = 'failed';
+		}
+	}
 
-  function onOrder() {
-    // TODO 芋艿：待测试
-    if (state.orderType === 'recharge') {
-      sheep.$router.redirect('/pages/pay/recharge-log');
-    } else {
-      sheep.$router.redirect('/pages/order/list');
-    }
-  }
+	function onOrder() {
+		// TODO 芋艿：待测试
+		if (state.orderType === 'recharge') {
+			sheep.$router.redirect('/pages/pay/recharge-log');
+		} else {
+			sheep.$router.redirect('/pages/order/list');
+		}
+	}
 
-  // TODO 芋艿：待测试
-  // #ifdef MP
-  function subscribeMessage() {
-    let event = ['order_dispatched'];
-    if (state.tradeOrder.type === 3) {
-      event.push('groupon_finish');
-      event.push('groupon_fail');
-    }
-    sheep.$platform.useProvider('wechat').subscribeMessage(event);
-  }
-  // #endif
+	// TODO 芋艿：待测试
+	// #ifdef MP
+	function subscribeMessage() {
+		let event = ['order_dispatched'];
+		if (state.tradeOrder.type === 3) {
+			event.push('groupon_finish');
+			event.push('groupon_fail');
+		}
+		sheep.$platform.useProvider('wechat').subscribeMessage(event);
+	}
+	// #endif
 
-  onLoad(async (options) => {
-    // 支付订单号
-    if (options.id) {
-      state.id = options.id;
-    }
-    // 订单类型
-    if (options.orderType) {
-      state.orderType = options.orderType;
-    }
+	onLoad(async (options) => {
+		// 支付订单号
+		if (options.id) {
+			state.id = options.id;
+		}
+		// 订单类型
+		if (options.orderType) {
+			state.orderType = options.orderType;
+		}
 
-    // 支付结果传值过来是失败，则直接显示失败界面
-    if (options.payState === 'fail') {
-      state.result = 'failed';
-    } else {
-      // 轮询三次检测订单支付结果
-      await getOrderInfo(state.id);
-    }
-  });
+		// 支付结果传值过来是失败，则直接显示失败界面
+		if (options.payState === 'fail') {
+			state.result = 'failed';
+		} else {
+			// 轮询三次检测订单支付结果
+			await getOrderInfo(state.id);
+		}
+	});
 
-  onShow(() => {
-    if (isEmpty(state.orderInfo)) {
-      return;
-    }
-    getOrderInfo(state.id);
-  });
+	onShow(() => {
+		if (isEmpty(state.orderInfo)) {
+			return;
+		}
+		getOrderInfo(state.id);
+	});
 
-  onHide(() => {
-    state.result = 'unpaid';
-    state.counter = 0;
-  });
+	onHide(() => {
+		state.result = 'unpaid';
+		state.counter = 0;
+	});
 </script>
+<style lang="scss" scope>
+	.main {
+		background: white;
+		width: 85%;
+		padding: 15px;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		border-radius: 12px;
 
-<style lang="scss" scoped>
-  @keyframes rotation {
-    0% {
-      transform: rotate(0deg);
-    }
+		.img {
+			width: 80px;
+			height: 80px;
+			display: block;
+			margin: 0 auto;
+			margin-top: -52px;
+		}
 
-    100% {
-      transform: rotate(360deg);
-    }
-  }
+		.title {
+			text-align: center;
+			font-size: 18px;
+			margin: 15px 0;
+			font-weight: 700;
+		}
 
-  .score-img {
-    width: 36rpx;
-    height: 36rpx;
-    margin: 0 4rpx;
-  }
+		.ddxx {
+			display: flex;
+			justify-content: space-between;
+			margin: 10px 0;
 
-  .pay-result-box {
-    padding: 60rpx 0;
+			.l {
+				font-size: 17px;
+			}
 
-    .pay-waiting {
-      margin-top: 20rpx;
-      width: 60rpx;
-      height: 60rpx;
-      border: 10rpx solid rgb(233, 231, 231);
-      border-bottom-color: rgb(204, 204, 204);
-      border-radius: 50%;
-      display: inline-block;
-      // -webkit-animation: rotation 1s linear infinite;
-      animation: rotation 1s linear infinite;
-    }
+			.r {
+				font-size: 16px;
+				color: rbga(102, 102, 102);
+			}
+		}
 
-    .pay-img {
-      width: 130rpx;
-      height: 130rpx;
-    }
+		.fgx {
+			margin: 20px 0;
+			height: 1px;
+			width: 100%;
+			background: rgba(239, 239, 239);
+		}
 
-    .tip-text {
-      font-size: 30rpx;
-      font-weight: bold;
-      color: #333333;
-    }
+		.ck-detail {
+			// background: rgba(254,92,45);
+			background: rgba(230, 50, 34);
+			padding: 10px 0;
+			color: white;
+			font-size: 19px;
+			text-align: center;
+			width: 100%;
+			margin-bottom: 15px;
+			border-radius: 31px;
+		}
 
-    .pay-total-num {
-      font-size: 36rpx;
-      font-weight: 500;
-      color: #333333;
-      font-family: OPPOSANS;
-    }
+		.bk-home {
+			border: 1px solid rgba(230, 50, 34);
+			padding: 10px 0;
+			color: rgba(230, 50, 34);
+			font-size: 19px;
+			text-align: center;
+			width: 100%;
+			border-radius: 31px;
+		}
 
-    .btn-box {
-      width: 100%;
-
-      .back-btn {
-        width: 190rpx;
-        height: 70rpx;
-        font-size: 28rpx;
-        border: 2rpx solid #dfdfdf;
-        border-radius: 35rpx;
-        font-weight: 400;
-        color: #595959;
-      }
-
-      .check-btn {
-        width: 190rpx;
-        height: 70rpx;
-        font-size: 28rpx;
-        border: 2rpx solid #dfdfdf;
-        border-radius: 35rpx;
-        font-weight: 400;
-        color: #595959;
-        margin-left: 32rpx;
-      }
-    }
-
-    .subscribe-box {
-      .subscribe-img {
-        width: 44rpx;
-        height: 44rpx;
-      }
-
-      .subscribe-title {
-        font-weight: 500;
-        font-size: 32rpx;
-        line-height: 36rpx;
-        color: #434343;
-      }
-
-      .subscribe-start {
-        color: var(--ui-BG-Main);
-        font-weight: 700;
-        font-size: 32rpx;
-        line-height: 36rpx;
-      }
-    }
-  }
+	}
 </style>
+
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index 238b28a..ab57df8 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -33,12 +33,12 @@
 
 			<view class="new-point">
 				<view class="l">
-					<view class="b">1000</view>
-					<view class="c">累计积分（带对接接口）</view>
+					<view class="b">{{state.pointData.addUp}}</view>
+					<view class="c">累计积分</view>
 				</view>
 				<view class="l">
-					<view class="b">1000</view>
-					<view class="c">累计消费（带对接接口）</view>
+					<view class="b">{{state.pointData.reduce}}</view>
+					<view class="c">累计消费</view>
 				</view>
 				<view class="l">
 					<view class="b">0</view>
@@ -115,6 +115,11 @@
 </template>
 
 <script setup>
+	import request from '@/sheep/request';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
 	import sheep from '@/sheep';
 	import {
 		onLoad,
@@ -146,7 +151,8 @@
 		loadStatus: '',
 		date: [],
 		today: '',
-		isShow: 1
+		isShow: 1,
+		pointData:[]
 	});
 
 	const tabMaps = [{
@@ -170,6 +176,18 @@
 			return state.date.join('~');
 		}
 	});
+	
+	// 
+	// 
+	function brandlists3() {
+		request({
+			url: `${baseUrl}${apiPath}/member/point/record/getPointInfo`,
+			method: 'GET',
+		}).then((res) => {
+			console.log(res, "------brandList3---------");
+			state.pointData = res.data;
+		});
+	}
 
 	async function getLogList() {
 		state.loadStatus = 'loading';
@@ -195,6 +213,7 @@
 		state.today = dayjs().format('YYYY-MM-DD');
 		state.date = [state.today, state.today];
 		getLogList();
+		brandlists3();
 	});
 
 	function onChange(e) {