From f547216c2b72a08380bab25c2de679bb2f287b79 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Thu, 16 May 2024 15:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E5=94=AE=E4=BB=B7=E9=80=BB=E8=BE=91=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8B=E5=8D=95=E9=87=8D=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/goods/types.ts                      |  1 +
 src/components/sku-dialog.vue               |  1 +
 src/pages/mall/index.vue                    | 23 +++++++++++++++++++--
 src/pages/mall/subs/goods/detail.vue        |  8 +++++--
 src/pages/mall/subs/order/order-confirm.vue | 16 +++++++++-----
 src/pages/mine/subs/contact/index.vue       |  4 ++--
 src/store/modules/user/index.ts             | 14 ++++++++-----
 src/store/modules/user/types.ts             |  2 +-
 8 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/src/api/goods/types.ts b/src/api/goods/types.ts
index 5efda7f..23b2cf5 100644
--- a/src/api/goods/types.ts
+++ b/src/api/goods/types.ts
@@ -26,6 +26,7 @@ export interface GoodsBean {
   name: string;
   price: number;
   send_num: number;
+  priceExt: number;
   price_ext: number;
   payPrice: number;
   profile: string;
diff --git a/src/components/sku-dialog.vue b/src/components/sku-dialog.vue
index 3eb7241..0fe8141 100644
--- a/src/components/sku-dialog.vue
+++ b/src/components/sku-dialog.vue
@@ -85,6 +85,7 @@ const show = async (goodsId: string, fn: Function) => {
   callback = fn;
 
   goodsDetailBean.value = await getGoodsDetail(goodsId);
+  goodsDetailBean.value.price = userStore.getRealGoodsPrice(goodsDetailBean.value?.price,goodsDetailBean.value?.priceExt)
   goodsDetailBean.value.consumePrice = Number((goodsDetailBean.value?.price * userInfo?.value.userDiscount).toFixed(2));
 
   if((goodsDetailBean.value?.stocks?.length || 0) <= 0) {
diff --git a/src/pages/mall/index.vue b/src/pages/mall/index.vue
index 28eac68..1ee23b5 100644
--- a/src/pages/mall/index.vue
+++ b/src/pages/mall/index.vue
@@ -24,7 +24,8 @@
             <text class='goods-name'>{{ item.goodsName || '未知' }}</text>
             <text class='goods-price'>¥{{ (item.price * userInfo.userDiscount).toFixed(2) }}
               <text v-if='userInfo.userDiscount>0&&userInfo.userDiscount<1'
-                    style='text-decoration: line-through;color: #999999;font-size: 25rpx'>¥{{ item.price }}
+                    style='text-decoration: line-through;color: #999999;font-size: 25rpx'>
+                ¥{{ item.price }}
               </text>
             </text>
             <image class='add-image' :src='assetsUrl("ic_add_goods.png")' @click.stop='addShoppingCart(item)' />
@@ -46,6 +47,7 @@
 </template>
 
 <script setup lang='ts'>
+import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
 import SkuDialog from '@/components/sku-dialog.vue';
 import { assetsUrl, defaultImage } from '@/utils/assets';
 import { goLogin, goPath, isLogin, showToast } from '@/utils';
@@ -55,7 +57,7 @@ import useShoppingCartStore from '@/store/modules/shoppingcart';
 import { useUserStore } from '@/store';
 
 const userStore = useUserStore();
-const { userInfo,companyConfigInfo } = storeToRefs(userStore);
+const { userInfo, companyConfigInfo } = storeToRefs(userStore);
 const shoppingCartStore = useShoppingCartStore();
 const { totalCount } = storeToRefs(shoppingCartStore);
 
@@ -84,6 +86,19 @@ onLoad(() => {
   fetchCategoryList();
 });
 
+onShareAppMessage((e) => {
+  return {
+    title: 'VIP顾客中心',
+    path: '/pages/mall/index'
+  };
+});
+
+onShareTimeline((e) => {
+  return {
+    title: 'VIP顾客中心',
+    path: '/pages/mall/index'
+  };
+});
 const fetchCategoryList = async () => {
   if(companyConfigInfo.value.mallopen == 1) {
     const list = await getCategoryList();
@@ -131,6 +146,10 @@ const fetchGoodsList = async (refresh: boolean = true) => {
   } else {
     goodsList.value = goodsList.value.concat(rows);
   }
+
+  goodsList.value.forEach(e => {
+    e.price = userStore.getRealGoodsPrice(e.price, e.priceExt);
+  });
 };
 
 const loadMore = () => {
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index b9030b1..181e66c 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -3,7 +3,7 @@
     <view class='swiper-container'>
       <swiper class='swiper' :interval='1500' :duration='1000' @change='swiperChange'>
         <swiper-item v-for='(item,index) in [goodsBean?.images]' :key='index'>
-          <image :src='item||defaultImage' />
+          <image :src='item||defaultImage' mode='aspectFill' />
         </swiper-item>
       </swiper>
       <view class='indicator' style='display: none'>
@@ -25,7 +25,7 @@
       </view>
 
       <view class='c-flex-row'>
-        <text style='flex: 1'>{{ goodsBean?.name }}</text>
+        <text style='flex: 1'>{{ goodsBean?.name || '未知' }}</text>
         <view class='share-button'>
           <image :src='assetsUrl("ic_share.png")'></image>
           <button class='btn' plain open-type='share'>分享</button>
@@ -129,6 +129,7 @@ const swiperIndex = ref(0);
 onLoad(async (e: any) => {
   await uni.showLoading();
   goodsBean.value = await getGoodsDetail(e.goodsId);
+  goodsBean.value.price = userStore.getRealGoodsPrice(goodsBean.value?.price, goodsBean.value?.priceExt);
   const { rows } = await getGoodsList({
     page: {
       page: 1,
@@ -140,6 +141,9 @@ onLoad(async (e: any) => {
     }
   });
   recommendList.value = rows;
+  recommendList.value?.forEach(e => {
+    e.price = userStore.getRealGoodsPrice(e.price, e.priceExt);
+  });
   uni.hideLoading();
 });
 
diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index 608faae..d1b7450 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -42,7 +42,7 @@
           <image class='goods-image' :src='item.images||defaultImage' />
           <view class='c-flex-column' style='flex: 1;'>
             <view class='c-flex-row'>
-              <text class='goods-name'>{{ item.name }}</text>
+              <text class='goods-name'>{{ item.name || '未知' }}</text>
             </view>
             <text style='color: #999999;margin-top: 30rpx'>
               {{ item.code }}
@@ -193,6 +193,10 @@ const navigateTo = (e: any) => {
     },
     onFailure: () => {
       console.error('pay onFailure');
+      if(orderBean.value?.id) {
+        orderBean.value.id = '';
+      }
+      createOrder();
     }
   });
 };
@@ -233,10 +237,12 @@ const createOrder = async () => {
     ))
   };
 
-  await uni.showLoading();
-  const result = await orderCreate(params);
-  orderBean.value!.id = result.id;
-  uni.hideLoading();
+  if(orderBean.value?.id == undefined || orderBean.value?.id == '') {
+    await uni.showLoading();
+    const result = await orderCreate(params);
+    orderBean.value!.id = result.id;
+    uni.hideLoading();
+  }
 
   //删除购物车已存在商品
   orderBean?.value?.orderGoods?.forEach(item => {
diff --git a/src/pages/mine/subs/contact/index.vue b/src/pages/mine/subs/contact/index.vue
index ba5e08a..05d7d1c 100644
--- a/src/pages/mine/subs/contact/index.vue
+++ b/src/pages/mine/subs/contact/index.vue
@@ -2,12 +2,12 @@
   <view class='card-view'>
     <view class='c-flex-row'>
       <text class='key'>姓名</text>
-      <text class='value'>{{ companyConfigInfo.contactname}}</text>
+      <text class='value'>{{ companyConfigInfo?.contactname}}</text>
     </view>
     <view class='divider' />
     <view class='c-flex-row'>
       <text class='key'>手机号</text>
-      <text class='value'>{{companyConfigInfo.contacttelephone}}</text>
+      <text class='value'>{{companyConfigInfo?.contacttelephone}}</text>
       <image :src='assetsUrl("ic_contact_merchant.png")' @click.stop='call' />
     </view>
   </view>
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 4bbec6f..3b8205a 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -52,21 +52,25 @@ const useUserStore = defineStore('user', {
     // }
 
     getUserDiscount(): number {
-      if(this.userInfo.levelEntity.discount > 0 && this.userInfo.levelEntity.discount < 10) {
-        return this.userInfo.levelEntity.discount / 10;
-      } else if(this.userInfo.levelEntity.discount >= 10 && this.userInfo.levelEntity.discount <= 100) {
-        return this.userInfo.levelEntity.discount / 100;
+      if(this.userInfo.levelEntity?.discount > 0 && this.userInfo.levelEntity?.discount < 10) {
+        return this.userInfo.levelEntity?.discount / 10;
+      } else if(this.userInfo.levelEntity?.discount >= 10 && this.userInfo.levelEntity?.discount <= 100) {
+        return this.userInfo.levelEntity?.discount / 100;
       }
       return 1;
     },
 
+    getRealGoodsPrice: (state) => (price: number, priceExt: number) => {
+      return state.userInfo.salePrice == 'price_ext' ? priceExt||0 : price;
+    }
   },
 
   actions: {
     // 设置用户的信息
     async setUserInfo(partial: Partial<UserBean>) {
       this.userInfo = partial as UserBean;
-      this.userInfo.levelEntity.discount = 79;
+      // this.userInfo.levelEntity?.discount = 79;
+      // this.userInfo.salePrice = 'price_ext';
       this.userInfo.userDiscount = this.getUserDiscount;
       await setCompanyId(this.userInfo.companyId);
       await this.fetchTerminal();
diff --git a/src/store/modules/user/types.ts b/src/store/modules/user/types.ts
index 84e5197..2ee7ea5 100644
--- a/src/store/modules/user/types.ts
+++ b/src/store/modules/user/types.ts
@@ -38,7 +38,7 @@ export interface UserBean {
   registerDay: number;
   relatedRate: number;
   remark: string;
-  salePrice: number;
+  salePrice: string;
   source: string;
   status: string;
   storeId: string;