增加分销页面，订单增加会员折扣

pages/order/components/orderInfo.vue

@@ -163,7 +163,7 @@
                 <image
                   src="/static/icon/coup.png"
                   bgColor="#fff"
-                  style="width: 40rpx; height: 34rpx"
+                  style="width: 50rpx; height: 50rpx"
                 ></image>
                 <text class="color-333 font-14 u-m-l-16 no-wrap">满减活动</text>
               </view>
@@ -172,12 +172,26 @@
                 >-￥{{ cartStore.orderCostSummary.fullReduction.actualAmount }}</view
               >
             </view>
+            <view class="youhui-item" v-if="cartStore.orderCostSummary.vipDiscountAmount">
+              <view class="u-flex align-center">
+                <image
+                  src="/static/icon/newUserDiscount.png"
+                  bgColor="#fff"
+                  style="width: 50rpx; height: 50rpx"
+                ></image>
+                <text class="color-333 font-14 u-m-l-16 no-wrap">会员折扣</text>
+              </view>
+
+              <view class="red font-12 u-flex align-center"
+                >-￥{{ cartStore.orderCostSummary.vipDiscountAmount }}</view
+              >
+            </view>
             <view class="youhui-item" v-if="newUserDiscount">
               <view class="u-flex align-center">
                 <image
                   src="/static/icon/newUserDiscount.png"
                   bgColor="#fff"
-                  style="width: 40rpx; height: 34rpx"
+                  style="width: 50rpx; height: 50rpx"
                 ></image>
                 <text class="color-333 font-14 u-m-l-16 no-wrap">新客立减</text>
               </view>
@@ -197,8 +211,8 @@
                 <view class="u-flex" style="width: 44rpx">
                   <u-image
                     bgColor="#fff"
-                    :width="item.width || '44rpx'"
-                    :height="item.height || '44rpx'"
+                    :width="item.width || '50rpx'"
+                    :height="item.height || '50rpx'"
                     v-if="item.icon"
                     :src="item.icon"
                     mode=""
@@ -414,7 +428,8 @@ import {
 } from "@/common/api/shop/index.js";
 import goodsIcon from "@/static/icon/goods.png";
 import coupIcon from "@/static/icon/coup.png";
-import pointsIcon from "@/static/icon/points.png";
+// import pointsIcon from "@/static/icon/points.png";
+import pointsIcon from "@/static/icon/jifen.png";
 // 定义自定义事件
 const emits = defineEmits(["customevent", "istype", "learcoupons"]);
 
@@ -453,8 +468,6 @@ const favorablelist = ref([
   {
     name: "优惠券",
     type: "coupon",
-    width: "40rpx",
-    height: "34rpx",
     value: "",
     icon: coupIcon,
     url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png",

pages/user/user.vue

@@ -242,9 +242,7 @@
     </view>
 
     <!-- 生成公众号二维码 -->
-    <we-qrcode
-      @generate="(e) => qrcodeResult(e)"
-    ></we-qrcode>
+    <we-qrcode @generate="(e) => qrcodeResult(e)"></we-qrcode>
   </view>
 </template>
 
@@ -258,10 +256,8 @@ import * as vipApi from "@/common/api/market/vip.js";
 import * as rechargeApi from "@/common/api/market/recharge.js";
 import { pointsShopList } from "@/common/api/account/points.js";
 
-
-
 function qrcodeResult(res) {
-  qrcode.value = res
+  qrcode.value = res;
 }
 
 const store = productStore();
@@ -277,6 +273,11 @@ const myFunList = ref([
     type: "my_coupon",
     icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png",
   },
+  {
+    name: "分销",
+    type: "fenxiao",
+    icon: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/my_coupon.png",
+  },
   // {
   // 	name: "我的订单",
   // 	type: "my_order",
@@ -414,6 +415,11 @@ const clickTo = (item, index) => {
         shopId: uni.cache.get("shopId") || "",
       });
       break;
+    case "fenxiao": //优惠券
+      uni.navigateTo({
+        url: "/distribution/index",
+      });
+      break;
     case "myself": //内部页面
       uni.pro.navigateTo("user/myself");
       break;
@@ -470,9 +476,8 @@ onShow(() => {
 
 const qrcode = ref("");
 const showQrcode = computed(() => {
-
   const followIndex = uni.cache.get("followIndex");
-  if ( followIndex == "mine" && qrcode.value) {
+  if (followIndex == "mine" && qrcode.value) {
     return true;
   }
 });