feat: 店铺收藏更新

src/App.vue

@@ -1,10 +1,14 @@
 <script setup lang="ts">
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
+import {useAddressStore} from "~/stores/addressStore";
+const addressStore = useAddressStore()
+
 onLaunch(() => {
   console.log("App Launch");
 });
 onShow(() => {
   console.log("App Show");
+  addressStore.getCurrentAddress()
 });
 onHide(() => {
   console.log("App Hide");

src/apis/merchant.ts

@@ -1,5 +1,5 @@
 import { defHttp } from '~/utils/http'
-import type {MerchantCategoryModel, StoreParams, StoreResult} from "~/apis/model/storeModel";
+import type {MerchantCategoryModel, MerchantDetailModel, StoreParams, StoreResult} from "~/apis/model/storeModel";
 import type {PageModel} from "~/apis/model/pageModel";
 import type {ZibubaojianResult} from "~/apis/model/zibubaojian.model";
 import type {VipAreaResult} from "~/apis/model/vip-area.model";
@@ -37,7 +37,11 @@ export function getSelectMerchantSort() {
     })
 }
 
-export function getMerchantDetail(id: string) {
+/**
+ * 获取商铺详情 getShopInfo
+ * @param id
+ */
+export function getMerchantDetail(id: string): Promise<MerchantDetailModel> {
     return defHttp.get({
         url: API.GET_DETAIL + `/${id}`
     }, {

src/apis/model/relation.model.ts

@@ -0,0 +1,6 @@
+export interface RelationRequest {
+    // 1 商品，10 店铺
+    type: string
+    // 商品ID，店铺ID
+    type_id: string
+}

src/apis/model/shopping.model.ts

@@ -44,4 +44,4 @@ export interface ProductAttrDataModel {
     unique: string
     sku: string
     image: string
-}
+}

src/apis/model/storeModel.ts

@@ -1,3 +1,85 @@
+export interface MerchantDetailModel {
+    mer_id: string//商户id
+    uid: string//商户用户id
+    merch_no: string
+    trade_type: string
+    category_id: string//分类id
+    mer_name: string//店铺名称
+    haike_settle_status: string
+    name: string
+    distance: string//距离
+    mer_address: string//店铺地址
+    mer_keyword: string
+    mer_avatar: string//店铺头像
+    mer_banner: string//店铺轮播图
+    sales: string//销量
+    product_score: string//商品描述评分
+    service_score: string//服务评分
+    postage_score: string//物流评分
+    mark: string
+    status: string//商户是否禁用0锁定,1正常
+    commission_rate: string
+    is_bro_room: string
+    is_bro_goods: string
+    mer_info: string//店铺简介
+    service_phone: string//店铺电话
+    create_time: string//创建时间
+    care_count: string//关注总数
+    copy_product_num: string
+    lat: string//纬度
+    lng: string//经度
+    doorhead: string//门头照
+    addr: string
+    house_number: string
+    business_license: string//营业执照
+    recommender: string//推广员
+    content_pic: string
+    card_positive_person: string
+    card_back_person: string
+    email: string//邮箱
+    bank_account: string
+    bank_location: string
+    bank_deposit: string
+    bank_branch: string
+    open_account: string//开户许可证
+    logo: string//logo
+    business_addr: string
+    district_addr: string
+    type: string
+    province_id: string
+    city_id: string
+    area_id: string
+    street_id: string
+    branch: string
+    business_id: string
+    request_id: string
+    renqizhi: string
+    withdrawal_setting: string
+    haike_mp: string
+    member_no: string
+    sxy_submerchant_id: string
+    buy_time: string
+    tz_money: string
+    tz_integral: string
+    hf_status: string
+    hf_member_id: string
+    hf_member_id_wx: string
+    hf_msg: string
+    merchant_type: string
+    hf_type: string
+    expire_time: string
+    hf_dimension_id_wx: string
+    hf_dimension_id_al: string
+    hf_pingtai_id_al: string
+    hf_pingtai_id_wx: string
+    dc_id: string
+    care: boolean
+    like: boolean
+    topping: boolean
+    // private boolean care: string//关注
+    // private boolean like: string
+    // private boolean topping
+}
 export interface StoreParams {
     // 分页
     pageNum: number

src/apis/order.api.ts

@@ -66,6 +66,18 @@ enum API {
     CHECK_GROUP_ORDER = '/api/order/check_group_order'
 }
 
+/**
+ * 三方订单
+ * @param params
+ */
+export function getThirdOrder(params: { type: string, page: number, limit: 10 | number}) {
+    return defHttp.get({
+        url: API.USER_THIRD_ORDER,
+        data: {
+            ...params
+        }
+    })
+}
 
 // 检查大仓会员
 export function checkGroupOrder(id: string) {

src/apis/user.ts

@@ -27,6 +27,7 @@ import type {ShoppingResult} from "~/apis/model/shopping.model";
 import type {AddressResult, OneAddressModel} from "~/apis/model/address.model";
 import type {UserVipInfoModel} from "~/apis/model/user-vip-info.model";
 import type {CertificationRequest} from "~/apis/model/certification.model";
+import type {RelationRequest} from "~/apis/model/relation.model";
 
 // 会员中心的提现
 // export function entropy(data) {
@@ -131,11 +132,35 @@ enum API {
     CREATE_USER_ADDRESS = '/api/user/address/new_create',
     USER_ADDRESS_DETAIL = '/api/user/address/detail',
     USER_VIP_INFO = '/api/warehouse/UserVipInfo',
+    DELETE_USER_ADDRESS = '/api/user/address/delete',
 
-    USER_ADD_CERTIFICATION = '/api/user/add_certification'
+    USER_ADD_CERTIFICATION = '/api/user/add_certification',
+
+   // 关注商铺
+    USER_RELATION_CREATE = '/api/user/relation/create',
     // getCertification
 }
 
+/* 关注/收藏
+ */
+export function relation(params: RelationRequest) {
+    return defHttp.post({
+        url: API.USER_RELATION_CREATE,
+        data: {
+            ...params
+        }
+    })
+}
+/**
+ * 删除地址
+ * @param id
+ */
+export function deleteAddress(id: string) {
+    return defHttp.post({
+        url: API.DELETE_USER_ADDRESS + `/${id}`
+    })
+}
+
 /**
  * 五级联动地址
  * @param pid
@@ -180,7 +205,7 @@ export function submitCertification(params: CertificationRequest) {
  */
 export function getUserAddressDetail(id: string) {
     return defHttp.get({
-        url: API.USER_ADDRESS_DETAIL + `/?id=${id}`
+        url: API.USER_ADDRESS_DETAIL + `/${id}`
     })
 }
 export function addressNewCreate(params: {

src/auto-imports.d.ts

@@ -86,6 +86,7 @@ declare global {
   const toValue: typeof import('vue')['toValue']
   const triggerRef: typeof import('vue')['triggerRef']
   const unref: typeof import('vue')['unref']
+  const useAddressStore: typeof import('./stores/addressStore')['useAddressStore']
   const useAppStore: typeof import('./stores/app')['useAppStore']
   const useAppStoreWidthOut: typeof import('./stores/app')['useAppStoreWidthOut']
   const useAttrs: typeof import('vue')['useAttrs']
@@ -95,6 +96,7 @@ declare global {
   const useCustomStyleProp: typeof import('./composables/useProps')['useCustomStyleProp']
   const useDacangStore: typeof import('./stores/dacangStore')['useDacangStore']
   const useDirectionProp: typeof import('./composables/useProps')['useDirectionProp']
+  const useOrderStore: typeof import('./stores/addressStore')['useOrderStore']
   const usePageStore: typeof import('./stores/page')['usePageStore']
   const usePageStoreWidthOut: typeof import('./stores/page')['usePageStoreWidthOut']
   const useSizeProp: typeof import('./composables/useProps')['useSizeProp']
@@ -197,6 +199,7 @@ declare module 'vue' {
     readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
     readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
     readonly unref: UnwrapRef<typeof import('vue')['unref']>
+    readonly useAddressStore: UnwrapRef<typeof import('./stores/addressStore')['useAddressStore']>
     readonly useAppStore: UnwrapRef<typeof import('./stores/app')['useAppStore']>
     readonly useAppStoreWidthOut: UnwrapRef<typeof import('./stores/app')['useAppStoreWidthOut']>
     readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>
@@ -302,6 +305,7 @@ declare module '@vue/runtime-core' {
     readonly toValue: UnwrapRef<typeof import('vue')['toValue']>
     readonly triggerRef: UnwrapRef<typeof import('vue')['triggerRef']>
     readonly unref: UnwrapRef<typeof import('vue')['unref']>
+    readonly useAddressStore: UnwrapRef<typeof import('./stores/addressStore')['useAddressStore']>
     readonly useAppStore: UnwrapRef<typeof import('./stores/app')['useAppStore']>
     readonly useAppStoreWidthOut: UnwrapRef<typeof import('./stores/app')['useAppStoreWidthOut']>
     readonly useAttrs: UnwrapRef<typeof import('vue')['useAttrs']>

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -15,7 +15,8 @@ const props = defineProps({
     default: false
   },
   detail: {
-    type: Object
+    type: Object,
+    required: true
   },
   sku: {
     type: Array,
@@ -105,13 +106,13 @@ function handleCountChange(value) {
       <div class="flex-1">
         <div class="p-3 flex flex-col gap-3">
           <div class="flex flex-row gap-3">
-            <image :src="currentSku.image"
+            <image :src="detail.image"
                    v-if="currentSku"
                    mode="widthFix" class="w-25 h-25 rounded"></image>
             <div class="flex flex-col w-full">
 
               <div class="flex gap-2 justify-between w-full">
-                <div class="text-overflow text-xs flex-1">
+                <div class="text-overflow text-xs flex-1" v-if="detail && detail.store_name">
                   {{ detail.store_name }}
                 </div>
                 <div
@@ -159,7 +160,6 @@ function handleCountChange(value) {
         <FButton
             @click="handleAddCart"
             size="small"
-            type="fill"
             :exClass="['!bg-primary', 'rounded-full', 'text-white']"
             block
         >

src/pages/home/components/navs.vue

@@ -60,12 +60,15 @@ const navList = ref([{
 }, {
   image: CDN_URL + '/static/home-nav/vip_img.png',
   title: '会员专区',
-  key: PLATFORM_NAME.DC,
-  categoryId: '567',
+  key: 'vip',
+  // key: PLATFORM_NAME.DC,
+  // categoryId: '567',
 }, {
   image: CDN_URL + '/static/home-nav/icon_hmyh_221014.png',
   title: '惠民专区',
-  key: PLATFORM_NAME.DC
+  key: PLATFORM_NAME.DC,
+  categoryId: '567',
+
 }, {
   image: CDN_URL + '/static/home-nav/home_gengduo.png',
   title: '更多',
@@ -94,6 +97,13 @@ function handleItemClick(item: any) {
       })
       break;
     }
+    // 会员专区
+    case 'vip': {
+      uni.navigateTo({
+        url: '/pages/vip/index'
+      })
+      break;
+    }
     // 秒杀
     case 'miaosha': {
       uni.navigateTo({

src/pages/home/index.vue

@@ -15,6 +15,7 @@ import {CDN_URL} from "~/config/app";
 // import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 // import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
 const userStore = useUserStore()
+
 // const list = ref([])
 const state = reactive({
   yanglaojine: {},
@@ -47,9 +48,10 @@ onShow(() => {
 })
 onLoad(() => {
   // getLocal()
+  // 加载地址数据
+  // orderStore.getCurrentAddress()
   // 1加载首页数据
-  getHomeQuickLink().then(res => {
-  })
+  getHomeQuickLink().then(res => {})
 
   getNoticeList().then(res => {
     state.announcementList = res.list
@@ -146,7 +148,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml" type="home">
+<route lang="yaml">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/order-confirm/index.vue

@@ -6,8 +6,13 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import FCell from "~/components/FCell/FCell.vue";
-
+import {encodePhone} from "~/utils";
+import {CDN_URL} from "~/config/app";
+import {useAddressStore} from "~/stores/addressStore";
+import {watchThrottled} from "@vueuse/core";
+const addressIcon = CDN_URL + '/static/assets/dingwi_220624.png'
 // const addressInfo = ref({})
+const addressStore = useAddressStore()
 const data = reactive({
   cartOrder: [],
 
@@ -25,41 +30,29 @@ const data = reactive({
   // proPrice: ''
 })
 onLoad((options) => {
-  // type
-  // product_id
-  // seckillId
-  // couponId
-  // pinkid
-  // cartId
-  // addressId
-  // is_address
-  // {cartId: "10149", type: "1", product_id: "5596"}
-  // console.log(options)
-  // options = {
-  //   cartId: '10149',
-  //   type: '1',
-  //   product_id: '5596'
-  // }
 
-  console.log(options.cartId)
+  // console.log(options.cartId)
   if (options && options.cartId) {
     data.cartId = options.cartId
   }
   if (options && options.product_id) {
     data.productId = options.product_id
   }
-  if (options && options.addressId) {
-    getUserAddressDetail(options.addressId).then(res => {
-      data.addressInfo = res
-      data.addressId = res.address_id || 0
-    })
-  } else {
-    getUserAddressList().then(res => {
-      data.addressInfo = res.list.length > 0 ? res.list[0] : {}
-      data.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
-    })
-  }
+  // if (options && options.addressId) {
+  //   // getUserAddressDetail(options.addressId).then(res => {
+  //   //   data.addressInfo = res
+  //   //   data.addressId = res.address_id || 0
+  //   // })
+  // } else {
+  //   getUserAddressList().then(res => {
+  //     data.addressInfo = res.list.length > 0 ? res.list[0] : {}
+  //     data.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
+  //   })
+  // }
+  data.addressInfo = addressStore.address
+  data.addressId = addressStore.address.address_id
 
+  // console.log(addressStore.address)
   /// 查看用户VIP信息
   getUserVipInfo().then(res => {
     console.log(res)
@@ -83,6 +76,10 @@ onLoad((options) => {
   })
 })
 
+watch(() => addressStore.address, (val) => {
+  data.addressInfo = val
+  data.addressId = val.address_id
+})
 function handleSubmit() {
   if (!data.addressId) {
     return uni.showToast({
@@ -155,23 +152,43 @@ function payment(createOrderData: CreateOrderRequest) {
     })
   })
 }
+
+function handleAddressSelect() {
+  uni.navigateTo({
+    url: '/pages/user/address/index?from=order'
+  })
+}
 </script>
 <template>
   <CXBBasePage>
     <div class="p-3 flex flex-col gap-3 pb-safe">
-      <div class="rounded bg-white p-3">
+      <div
+          @click="handleAddressSelect"
+          class="rounded bg-white p-3 flex">
         <div class="flex flex-col flex-1 gap-2">
           <div class="flex items-center gap-2">
-            <div class="flex text-sm text-gray-500">
-              {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district }}
+            <div class="flex text-sm text-gray-500 justify-between items-center w-full">
+              <div class="flex-1 flex items-center gap-2">
+                <div class="w-fit flex">
+                  <image :src="addressIcon" mode="widthFix" class="w-4 h-4"></image>
+                </div>
+                <div class="flex-1 flex">
+                  {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district }}
+                </div>
+              </div>
+
+              <div class="w-4 flex i-tabler-chevron-right text-gray"></div>
+
             </div>
           </div>
-          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>
+<!--          <div class="flex text-sm font-bold">{{ data.addressInfo.detail }}</div>-->
           <div class="flex gap-2 items-center text-xs text-gray-500">
             <div>
               {{ data.addressInfo.real_name }}
             </div>
-            <div>{{ data.addressInfo.phone }}</div>
+            <div v-if="data.addressInfo && data.addressInfo.phone">
+              {{ encodePhone(data.addressInfo.phone) }}
+            </div>
           </div>
         </div>
       </div>

src/pages/order/components/OrderItem.vue

@@ -1,20 +1,53 @@
 <template>
-  <div
-      @click="handleHeaderClick"
-      class="flex items-center justify-between f-hairline-bottom pb-3">
-    <div class="flex items-center font-bold gap-2 text-sm">
-      <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
-      {{ orderItem.merchant.mer_name }}
-    </div>
-    <div class="text-primary text-sm">
-      {{ getStatusText(orderItem) }}
+  <div class="mb-3 bg-white rounded p-3">
+    <div
+        @click="handleHeaderClick"
+        class="flex items-center justify-between f-hairline-bottom pb-3">
+      <div class="flex items-center font-bold gap-2 text-sm">
+        <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
+        {{ orderItem.merchant.mer_name }}
+      </div>
+      <div class="text-primary text-xs">
+        {{ getStatusText(orderItem) }}
+      </div>
     </div>
-  </div>
 
 
-  <div v-if="orderItem.orderList">
-    <div v-for="(order, index) in orderItem.orderList" :key="index">
-      <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
+    <div v-if="orderItem.orderList">
+      <div v-for="(order, index) in orderItem.orderList" :key="index">
+        <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
+          <div class="flex py-2 gap-3">
+            <div class="flex-1 flex gap-2">
+              <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+
+              <div class="flex flex-col">
+                <div class="line-clamp-2 text-[12px]">
+                  {{ orderProduct.cart_info.product.store_name }}
+                </div>
+                <div class="text-gray-500 text-[10px]">
+                  {{ orderProduct.cart_info.productAttr.sku }}
+                </div>
+              </div>
+            </div>
+
+            <div class="flex flex-col justify-center items-center">
+              <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+              <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
+            </div>
+
+          </div>
+          <div class="flex justify-end gap-2">
+            <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
+            <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
+
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+    <div v-else>
+      <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
         <div class="flex py-2 gap-3">
           <div class="flex-1 flex gap-2">
             <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
@@ -37,41 +70,12 @@
         </div>
         <div class="flex justify-end gap-2">
           <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
-          <nut-button size="small" plain type="primary">立即支付</nut-button>
+          <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
         </div>
       </div>
     </div>
-
   </div>
 
-  <div v-else>
-    <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
-      <div class="flex py-2 gap-3">
-        <div class="flex-1 flex gap-2">
-          <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
-
-          <div class="flex flex-col">
-            <div class="line-clamp-2 text-[12px]">
-              {{ orderProduct.cart_info.product.store_name }}
-            </div>
-            <div class="text-gray-500 text-[10px]">
-              {{ orderProduct.cart_info.productAttr.sku }}
-            </div>
-          </div>
-        </div>
-
-        <div class="flex flex-col justify-center items-center">
-          <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
-          <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
-        </div>
-
-      </div>
-      <div class="flex justify-end gap-2">
-        <nut-button size="small" type="default" @click="handleCancelOrder">取消订单</nut-button>
-        <nut-button size="small" plain type="primary" @click="handlePayment">立即支付</nut-button>
-      </div>
-    </div>
-  </div>
 
 </template>
 <script setup lang="ts">
@@ -149,8 +153,10 @@ function handleCancelOrder() {
 }
 
 function handlePayment() {
+  const { orderItem } = props
   uni.navigateTo({
-    url: `/pages/payment/index`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    // url: `/pages/payment/index`
   })
 }
 </script>

src/pages/order/index.vue

@@ -1,49 +1,52 @@
 <template>
-  <nut-tabs v-model="state.tabvalue">
-    <nut-tab-pane title="全部">
-      <div v-if="state.allOrderList.length > 0">
-        <div v-for="(orderItem, index) in state.allOrderList" :key="index">
-          <OrderItem :order-item="orderItem" />
+  <CXBBasePage>
+    <nut-tabs v-model="state.tabvalue">
+      <nut-tab-pane title="全部">
+        <div v-if="state.allOrderList.length > 0">
+          <div v-for="(orderItem, index) in state.allOrderList" :key="index">
+            <OrderItem :order-item="orderItem" />
+          </div>
         </div>
-      </div>
-      <CXBEmpty v-else/>
+        <CXBEmpty v-else/>
 
-    </nut-tab-pane>
-    <nut-tab-pane title="待付款">
-      <div v-if="state.obligationOrderList.length > 0">
-        <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
-          <OrderItem :order-item="orderItem" />
+      </nut-tab-pane>
+      <nut-tab-pane title="待付款">
+        <div v-if="state.obligationOrderList.length > 0">
+          <div v-for="(orderItem, index) in state.obligationOrderList" :key="index">
+            <OrderItem :order-item="orderItem" />
+          </div>
         </div>
-      </div>
-      <CXBEmpty v-else/>
-    </nut-tab-pane>
-    <nut-tab-pane title="待发货">
-      <div v-if="state.orderList.length > 0">
-        <div v-for="(orderItem, index) in state.orderList" :key="index">
-          <OrderItem :order-item="orderItem" />
+        <CXBEmpty v-else/>
+      </nut-tab-pane>
+      <nut-tab-pane title="待发货">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem" />
+          </div>
         </div>
-      </div>
-      <CXBEmpty v-else/>
+        <CXBEmpty v-else/>
 
-    </nut-tab-pane>
-    <nut-tab-pane title="待收货">
-      <div v-if="state.orderList.length > 0">
-        <div v-for="(orderItem, index) in state.orderList" :key="index">
-          <OrderItem :order-item="orderItem" />
+      </nut-tab-pane>
+      <nut-tab-pane title="待收货">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem" />
+          </div>
         </div>
-      </div>
-      <CXBEmpty v-else/>
+        <CXBEmpty v-else/>
 
-    </nut-tab-pane>
-    <nut-tab-pane title="待评价">
-      <div v-if="state.orderList.length > 0">
-        <div v-for="(orderItem, index) in state.orderList" :key="index">
-          <OrderItem :order-item="orderItem" />
+      </nut-tab-pane>
+      <nut-tab-pane title="待评价">
+        <div v-if="state.orderList.length > 0">
+          <div v-for="(orderItem, index) in state.orderList" :key="index">
+            <OrderItem :order-item="orderItem" />
+          </div>
         </div>
-      </div>
-      <CXBEmpty v-else/>
-    </nut-tab-pane>
-  </nut-tabs>
+        <CXBEmpty v-else/>
+      </nut-tab-pane>
+    </nut-tabs>
+
+  </CXBBasePage>
 </template>
 <script lang="ts" setup>
 // import { reactive } from 'vue';
@@ -56,6 +59,7 @@ import FButton from "~/components/FButton/FButton.vue";
 import OrderItem from "~/pages/order/components/OrderItem.vue";
 import amapWx from "~/libs/amap-wx";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 
 const state = reactive({
   tabvalue: '0',
@@ -165,3 +169,9 @@ style:
   navigationBarTitleText: 我的订单
   enablePullDownRefresh: true
 </route>
+
+<style>
+.nut-tab-pane {
+  background: #f5f5f5 !important;
+}
+</style>

src/pages/order/third-order.vue

@@ -23,6 +23,15 @@
 </template>
 <script setup lang="ts">
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {getThirdOrder} from "~/apis/order.api";
+enum TYPE {
+  JD = '6',
+  TB = '5',
+  PDD = '1',
+  DY = '9',
+  VIP = '2',
+  SU = '3'
+}
 const state = reactive({
   tabvalue: '0',
 
@@ -35,7 +44,45 @@ const state = reactive({
   orderList: [],
 });
 
+onLoad(() => {
+  loadOrderList('6')
+})
 
+watch(() => state.tabvalue, (val) => {
+  console.log(val)
+  switch (val) {
+    case '0': {
+      loadOrderList(TYPE.JD)
+      break
+    }
+    case '1': {
+      loadOrderList(TYPE.VIP)
+      break
+    }
+    case '2': {
+      loadOrderList(TYPE.SU)
+      break
+    }
+    case '3': {
+      loadOrderList(TYPE.TB)
+      break
+    }
+    case '4': {
+      loadOrderList(TYPE.PDD)
+      break
+    }
+    case '5': {
+      loadOrderList(TYPE.DY)
+      break
+    }
+  }
+})
+function loadOrderList(type: string) {
+
+  getThirdOrder({type, page: 1, limit: 10}).then(res => {
+    state.orderList = res
+  })
+}
 </script>
 
 <route lang="yaml">

src/pages/store/home/components/MerchantHeader.vue

@@ -1,15 +1,3 @@
-<script lang="ts" setup>
-import type {PropType} from "vue";
-import {MerchantModel} from "~/apis/model/storeModel";
-import CXBButton from "~/components/CXBButton/CXBButton.vue";
-
-const props = defineProps({
-  model: {
-    type: Object as PropType<MerchantModel>,
-    required: true
-  }
-})
-</script>
 <template>
   <div class="bg-light rounded-lg p-3 text-sm flex flex-col gap-4">
     <div class="flex flex-row justify-between items-center">
@@ -25,13 +13,22 @@ const props = defineProps({
         </div>
 
       </div>
-      <div class="rounded-full text-white bg-gradient-to-r from-[#fe0032] to-[#fe7577] w-12 h-6 text-xs text-white flex justify-center items-center px-2 gap-1">
+      <div
+          @tap="handleRelation"
+          v-if="!isCare"
+          class="rounded-full text-white bg-gradient-to-r from-[#fe0032] to-[#fe7577] w-12 h-6 text-xs text-white flex justify-center items-center px-2 gap-1">
         <div class="i-tabler-heart"></div>
         关注
       </div>
-<!--      <CXBButton>-->
-<!--        关注-->
-<!--      </CXBButton>-->
+      <div
+          v-if="isCare"
+          @tap="handleRemoveRelation"
+          class="rounded-full text-gray text-[11px] flex justify-center items-center px-2 gap-1 border border-solid border-1px border-gray w-12 h-6 ">
+        已关注
+      </div>
+      <!--      <CXBButton>-->
+      <!--        关注-->
+      <!--      </CXBButton>-->
     </div>
     <div class="flex flex-row items-center">
       <div class="basis-1/4 text-left">推荐</div>
@@ -42,3 +39,39 @@ const props = defineProps({
 
   </div>
 </template>
+
+<script lang="ts" setup>
+import type {PropType} from "vue";
+import {MerchantDetailModel} from "~/apis/model/storeModel";
+import CXBButton from "~/components/CXBButton/CXBButton.vue";
+import {relation, removeMyRelation} from "~/apis/user";
+
+const props = defineProps({
+  model: {
+    type: Object as PropType<MerchantDetailModel>,
+    required: true
+  }
+})
+
+const isCare = ref(props.model.care)
+function handleRelation() {
+  relation({
+    type: '10',
+    type_id: props.model.mer_id
+  }).then(res => {
+    isCare.value = true
+    uni.showToast({
+      title: '已关注'
+    })
+  })
+}
+
+function handleRemoveRelation() {
+  removeMyRelation({type: 10, type_id: props.model.mer_id}).then(res => {
+    isCare.value = false
+    uni.showToast({
+      title: '取消关注'
+    })
+  })
+}
+</script>

src/pages/store/home/index.vue

@@ -90,7 +90,7 @@ function handleNavItemClick(navItemId: any) {
     </div>
   </div>
 </template>
-<route lang="yaml">
+<route lang="yaml"  type="home">
 style:
   navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true

src/pages/store/product/detail.vue

@@ -42,8 +42,10 @@ onLoad((option: any) => {
   getProductDetail(id).then(res => {
     console.log(res)
     detail.value = res
-    if (res.mer_id === '148') {
-      detail.value.price = detail.value.price * 30
+    if (res && res.mer_id && res.mer_id === '148') {
+      if (detail.value && detail.value.price ) {
+        detail.value.price = detail.value.price * 30
+      }
     }
     // if (detail.value.mer_id === '148') {
     // }
@@ -91,7 +93,7 @@ function loadCartCount() {
 //   }
 // })
 const is148Merchant = computed(() => {
-  return detail.value.mer_id === '148'
+  return detail.value && detail.value.mer_id && detail.value.mer_id === '148'
 })
 //预览轮播图
 function previewImage(index: number) {
@@ -149,6 +151,11 @@ function handleCreateShopping() {
         state.isShowSku = false
       }
     }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
   })
 }
 
@@ -166,10 +173,11 @@ function handleCountChange(val) {
 </script>
 
 <template>
-  <div class="flex flex-col gap-3 pb-20">
+  <div class="flex flex-col gap-3 pb-20" v-if="detail">
     <div class="bg-white ">
       <div class="w-screen h-50">
         <swiper
+            v-if="detail && detail.slider_image"
             :indicator-dots="state.indicatorDots"
             indicator-active-color="#e93323"
             :autoplay="state.autoplay"
@@ -184,14 +192,17 @@ function handleCountChange(val) {
         </swiper>
       </div>
 
-      <div class="flex flex-col p-3 gap-3">
+      <div
+          class="flex flex-col p-3 gap-3">
         <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
-          <div v-if="is148Merchant" class="flex justify-end items-end gap-2">
+          <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
             <div class="!text-[24px]">{{ detail.price }} </div>
             <div class="text-sm">积分</div>
           </div>
           <div v-else>
-            ￥ {{ detail.price }}
+            <div v-if="detail.price">
+              ￥ {{ detail.price }}
+            </div>
           </div>
           <div
               v-if="!is148Merchant"
@@ -205,7 +216,7 @@ function handleCountChange(val) {
             class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
           <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
                  mode="widthFix" class="!w-8 "></image>
-          <div class="px-2 flex items-center jusitify-center">
+          <div class="px-2 flex items-center jusitify-center" v-if="detail.yanglao">
             <div>
               养老金 ¥{{ detail.yanglao }}
             </div>
@@ -213,10 +224,12 @@ function handleCountChange(val) {
         </div>
 
         <div class="flex flex-col gap-2">
-          <div class="flex font-bold">
+          <div class="flex font-bold" v-if="detail && detail.store_name">
             {{ detail.store_name }}
           </div>
-          <div class="text-gray-600 text-sm w-fit px-1"
+          <div
+              v-if="detail.store_info"
+              class="text-gray-600 text-sm w-fit px-1"
                :class="is148Merchant ? 'border border-solid border-gray' : ''"
           >
             {{ detail.store_info }}

src/pages/user/address/create.vue

@@ -175,7 +175,7 @@ export default {
                 title: '保存成功'
               })
               setTimeout(() => {
-                uni.navigateTo({
+                uni.redirectTo({
                   url: '/pages/user/address/index'
                 })
               }, 500)
@@ -227,10 +227,6 @@ export default {
 
     const events = {
       change(arg1, arg2) {
-        // console.log(args[0])
-        // console.log('change', ...args);
-        // formData.address = args
-        console.log(arg2)
         basicData.addressObject = arg2
       },
       pathChange(...args: any) {

src/pages/user/address/index.vue

@@ -3,10 +3,11 @@
     <div class="bg-white ">
       <div class="p-3 flex flex-col gap-3 pb-safe" v-if="data && data.length > 0">
         <div v-for="(item, index) in data" :key="index"
-             @tap="handleClickItem(item)"
              class="flex justify-center items-center f-hairline-bottom py-3 bg-white p-3"
         >
-          <div class="flex flex-col flex-1">
+          <div
+              @tap.stop="handleClickItem(item)"
+              class="flex flex-col flex-1">
             <div class="flex items-center gap-2">
               <div class="bg-primary h-4 w-7 text-[10px] text-white justify-center items-center text-center"
                    v-if="item.is_default == '1'"
@@ -23,7 +24,9 @@
               <div>{{ item.phone }}</div>
             </div>
           </div>
-          <div class="flex">
+          <div
+              @tap.stop="handleEditItem(item)"
+              class="flex">
             <div class="i-tabler-edit "></div>
 
           </div>
@@ -58,28 +61,23 @@
 import { ref, reactive } from 'vue';
 import {getUserAddressList} from "~/apis/user";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {encodeBase64} from "~/utils/http/helper";
+import type {AddressModel} from "~/apis/model/address.model";
+import {useAddressStore} from "~/stores/addressStore";
+
+
 export default {
   components: {CXBBasePage},
   setup() {
-    const data = ref([
-      // {
-      //   testid:3,
-      //   testaddressName:'姓名',
-      //   phone:'123****4567',
-      //   defaultAddress:false,
-      //   fullAddress:'北京市通州区测试测试测试测试测试测试测试测试测试'
-      // },
-      // {
-      //   testid:4,
-      //   testaddressName:'姓名',
-      //   phone:'123****4567',
-      //   defaultAddress:true,
-      //   fullAddress:'北京市通州区测试测试测试测试测试测试测试测试测试'
-      // },
-    ]);
-    onLoad(() => {
+    const data = ref([]);
+    const addressStore = useAddressStore()
+    const from = ref()
+    onLoad((options) => {
+      if (options && options.from) {
+        from.value = options.from
+      }
+      // from.value =
       getUserAddressList().then(res => {
-        console.log(res)
         if (res) {
           data.value = res.list
         }
@@ -92,9 +90,25 @@ export default {
       addressName: 'detail'
       // addressName:'testaddressName'
     });
-    const handleClickItem = (item)=>{
-      console.log('Click To Address');
-      console.log(item)
+    const handleEditItem = (item: AddressModel)=>{
+
+      uni.navigateTo({
+        url: `/pages/user/address/edit?data=${encodeBase64(item)}`
+      })
+    }
+
+    // 选择Item
+    const handleClickItem = (item: AddressModel) => {
+      // uni.navigateTo()
+      addressStore.getCurrentAddress(item.address_id)
+      console.log(from.value)
+      if (from.value && from.value === 'order') {
+        setTimeout(() => {
+          uni.navigateBack()
+        }, 300)
+      }
+      // setTimeout(() => {
+      // })
     }
     const editClick = ()=>{
       console.log('Click To Edit');
@@ -120,6 +134,7 @@ export default {
     // }
     return {
       data,
+      handleEditItem,
       handleClickItem,
       delClick,
       editClick,

src/pages/user/address/order-address.vue

@@ -0,0 +1,130 @@
+<template>
+  <CXBBasePage>
+    <div class="bg-white ">
+      <div class="p-3 flex flex-col gap-3 pb-safe" v-if="data && data.length > 0">
+        <div v-for="(item, index) in data" :key="index"
+             @tap="handleClickItem(item)"
+             class="flex justify-center items-center f-hairline-bottom py-3 bg-white p-3"
+        >
+          <div class="flex flex-col flex-1">
+            <div class="flex items-center gap-2">
+              <div class="bg-primary h-4 w-7 text-[10px] text-white justify-center items-center text-center"
+                   v-if="item.is_default == '1'"
+              >
+                默认
+              </div>
+              <div class="flex text-sm text-gray-500">{{ item.province + ' ' + item.city + ' ' + item.district + ' ' + item.village}}</div>
+            </div>
+            <div class="flex text-sm font-bold">{{ item.detail }}</div>
+            <div class="flex gap-2 items-center text-xs text-gray-500">
+              <div>
+                {{ item.real_name }}
+              </div>
+              <div>{{ item.phone }}</div>
+            </div>
+          </div>
+          <div class="flex">
+            <div class="i-tabler-edit "></div>
+
+          </div>
+
+
+        </div>
+
+      </div>
+
+      <div class="fixed bottom-0 p-safe w-full bg-white ">
+        <div class="px-3">
+          <nut-button block type="primary" @click="handleCreateAddress">新建收货地址</nut-button>
+        </div>
+      </div>
+    </div>
+  </CXBBasePage>
+  <!--  <nut-address-list
+        v-if="data && data.length > 0"
+        :data="data"
+        swipe-edition
+        show-bottom-button
+        @edit-icon="editClick"
+        @del-icon="delClick"
+        @click-item="clickItem"
+        @swipe-del="delClickSwipe"
+        @add="addAddress"
+        :options="dataOptions"
+    >
+    </nut-address-list>-->
+</template>
+<script lang="ts">
+import { ref, reactive } from 'vue';
+import {getUserAddressList} from "~/apis/user";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import {encodeBase64} from "~/utils/http/helper";
+import type {AddressModel} from "~/apis/model/address.model";
+export default {
+  components: {CXBBasePage},
+  setup() {
+    const data = ref([]);
+    onLoad((options) => {
+      // if (options && options.from) {
+      //   from.value = from
+      // }
+      // from.value =
+      getUserAddressList().then(res => {
+        if (res) {
+          data.value = res.list
+        }
+      })
+    })
+    const dataOptions = reactive({
+      // id: 'testid',
+      id: 'address_id',
+      addressDetail:'detail',
+      addressName: 'detail'
+      // addressName:'testaddressName'
+    });
+    const handleClickItem = (item: AddressModel)=>{
+
+      uni.navigateTo({
+        url: `/pages/user/address/edit?data=${encodeBase64(item)}`
+      })
+    }
+    const editClick = ()=>{
+      console.log('Click To Edit');
+    }
+    const delClick = ()=>{
+      console.log('Click To Delete');
+    }
+    const delClickSwipe = () => {
+      console.log('Click On DelClickSwipe');
+    };
+    const addAddress = ()=>{
+      console.log('Click To Add');
+    }
+
+    function handleCreateAddress() {
+      uni.navigateTo({
+        url: '/pages/user/address/create'
+      })
+    }
+
+    // function handleEdit(addressItem) {
+    //   console.log(addressItem)
+    // }
+    return {
+      data,
+      handleClickItem,
+      delClick,
+      editClick,
+      delClickSwipe,
+      addAddress,
+      handleCreateAddress,
+      dataOptions,
+    };
+  }
+};
+</script>
+
+<route lang="yaml">
+style:
+ navigationBarTitleText: 我的地址
+</route>

src/pages/vip/index.vue

@@ -0,0 +1,113 @@
+<template>
+  <CXBBasePage>
+    <div class="flex flex-col gap-3 ">
+      <image :src="homeBanner" mode="widthFix" class="h-full w-full "></image>
+      <div class="flex px-3">
+        会员专区
+      </div>
+      <div  class="px-3" v-if="list && list.length > 0">
+        <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
+          <div v-for="(item, index) in list"
+               :key="index"
+               @click="handleItemClick(item)"
+          >
+            <div
+                class="bg-white rounded-lg"
+            >
+              <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square"></image>
+
+              <div class="text-sm p-2 flex flex-col gap-1">
+                <div class="line-clamp-2">
+                  {{item.store_name}}
+                </div>
+                <div class="border border-solid border-1 border-red rounded flex text-xs items-center text-[#FE0032] w-fit">
+                  <image src="https://cdn.bjtdba.com/vod/image/2023-02-21/20230221093033267.png"
+                         mode="widthFix" class="!w-8 "></image>
+                  <div class="px-2 flex items-center jusitify-center">
+                    <div>
+                      养老金 ¥{{item.yanglao}}
+                    </div>
+                  </div>
+                </div>
+                <div class="flex flex-row items-center gap-2">
+                  <div class="flex text-[#FE0032] font-bold text-lg">
+                    <div>
+                      ￥
+                    </div>
+                    <div>
+                      {{ item.price }}
+                    </div>
+
+                  </div>
+
+                  <div class="bg-[#202020] text-[#FFDD99] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4">
+
+                    <div>
+                      大仓
+                    </div>
+                  </div>
+
+                </div>
+
+                <div class="line-through text-xs font-bold flex ">
+                  <div>
+                    ¥ {{item.ot_price}}
+                  </div>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </grid-view>
+
+      </div>
+    </div>
+
+  </CXBBasePage>
+</template>
+
+<script setup lang="ts">
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import FSearch from "~/components/FSearch/FSearch.vue";
+import {computed} from "vue";
+import {getVipAreaList} from "~/apis/merchant";
+import {CDN_URL} from "~/config/app";
+
+const homeBanner = CDN_URL + '/static/assets/home-banner.png'
+
+const systemInfo = uni.getSystemInfoSync()
+const statusBarHeight = systemInfo.statusBarHeight ?? 0
+
+const navBarStyle = computed(() => {
+  return {
+    paddingTop: `${statusBarHeight}px`,
+  }
+})
+
+const list = ref()
+
+onLoad(() => {
+  getVipAreaList({
+    page: 1,
+    limit: 20
+  }).then(res => {
+    // console.log(res.list)
+    console.log(res.list)
+    if (res) {
+      list.value = res.list
+    }
+  })
+})
+
+function handleItemClick(item) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
+</script>
+
+<route lang="yaml">
+style:
+  navigationBarTitleText: 储蓄保会员
+  enablePullDownRefresh: true
+</route>

src/pages/vip/vip.vue

@@ -1,71 +0,0 @@
-<script setup lang="ts">
-import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import FSearch from "~/components/FSearch/FSearch.vue";
-import {computed} from "vue";
-import FNavBar from "~/components/FNavBar/FNavBar.vue";
-import {getVipAreaList} from "~/apis/merchant";
-import ProductList from "~/components/ProductList/ProductList.vue";
-import {CDN_URL} from "~/config/app";
-const homeBannerImage = CDN_URL + '/static/home-banner.png'
-
-const systemInfo = uni.getSystemInfoSync()
-const statusBarHeight = systemInfo.statusBarHeight ?? 0
-
-const navBarStyle = computed(() => {
-  return {
-    paddingTop: `${statusBarHeight}px`,
-  }
-})
-
-const list = ref()
-
-onLoad(() => {
-  getVipAreaList({
-    page: 1,
-    limit: 20
-  }).then(res => {
-    // console.log(res.list)
-    console.log(res.list)
-    if (res) {
-      list.value = res.list
-    }
-  })
-})
-</script>
-<template>
-  <CXBBasePage>
-    <FNavBar :fixed="true" exClass="pl-2 z-100">
-      <div
-          class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
-
-        <image src="https://cdn.bjtdba.com/vod/image/2023-02-15/20230215112840149.png"
-               mode="widthFix"
-               class="w-4 h-4  pl-2 py-1"
-        ></image>
-        <div class="flex flex-1 items-center w-100%">
-          <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
-          <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
-            搜索
-          </div>
-        </div>
-
-      </div>
-    </FNavBar>
-    <div class="fixed w-screen">
-      <image :src="homeBannerImage" mode="widthFix" class="h-full w-full "></image>
-    </div>
-    <div>
-      <div class="text-bold">会员专区</div>
-      <ProductList
-          :list="list"
-      />
-    </div>
-  </CXBBasePage>
-</template>
-
-<route lang="yaml">
-style:
-  navigationStyle: custom
-  navigationBarTitleText: 储蓄保
-  enablePullDownRefresh: true
-</route>

src/stores/addressStore.ts

@@ -0,0 +1,37 @@
+import {defineStore} from "pinia";
+import type {AddressModel} from "~/apis/model/address.model";
+import {getUserAddressDetail, getUserAddressList} from "~/apis/user";
+export const useAddressStore = defineStore('addressStore', {
+    state: () => ({
+        address: {},
+        addressId: ''
+        // userInfo: Cache.get(USER_INFO) as UserInfoModel,
+        // token: Cache.get(LOGIN_STATUS) || null,
+        // isLogin: !!token,
+        // uid: Cache.get(UID) || null,
+        // mer_id: 0, // 店铺 ID
+        // permissionList: null // 权限列表
+    }),
+    actions: {
+        setCurrentAddressId(addressId: string) {
+            this.addressId = addressId
+        },
+        getCurrentAddress(addressId?: string) {
+            if (addressId) {
+                // this.address = address
+                getUserAddressDetail(addressId).then(address => {
+                    // data.addressInfo = res
+                    // data.addressId = res.address_id || 0
+                    this.address = address
+                })
+            } else {
+                getUserAddressList().then(res => {
+                    this.address = res.list.length > 0 ? res.list[0] : {}
+                    // this.addressId = res.list.length > 0 ? res.list[0].address_id : '0'
+                })
+            }
+            // this.currentAddress = address
+        },
+
+    }
+})

src/utils/index.ts

@@ -30,3 +30,8 @@ export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
 
     return src
 }
+
+export function encodePhone(phone: string) {
+    // let tel = '13600136000';
+    return phone.replace(/(\d{3})\d{4}(\d{4})/, "$1****$2")
+}

src/utils/util.ts

@@ -37,3 +37,4 @@ export function delay(ms: number) {
 }
 
 export function noop() {}
+