fix: 优化

.env.production

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://test.bjtdba.com'
+VITE_GLOB_API_URL = 'https://app.bjtdba.com'

src/apis/common.ts

@@ -44,7 +44,18 @@ enum API {
     // 意见反馈提交
     FEEDBACK = '/api/user/feedback',
     // 获取热门搜索关键词
-    HOT_KEYWORD = '/api/common/hot_keyword'
+    HOT_KEYWORD = '/api/common/hot_keyword',
+
+    HOME_BANNER = '/api/newhome/nologin/banner/home_banner_new'
+}
+
+/**
+ * 获取首页轮播图
+ */
+export function getHomeBanner() {
+    return defHttp.get({
+        url: API.HOME_BANNER,
+    })
 }
 
 // 获取热门搜索关键ygnk

src/apis/model/accumulateIncomeModel.ts

@@ -3,6 +3,7 @@ export interface UserInviteProfitParams {
     pageNum: number
     pageSize: number
     uid: string
+    commission_type?: string
 }
 
 export interface AccumulateIncomeModel {

src/apis/user.ts

@@ -368,8 +368,8 @@ export function addressNewCreate(params: {
     is_default: string,
     code_list: string,
     city_id: string,
-    village_id: string,
-    village: string
+    village_id?: string,
+    village?: string
 
 }) {
     return defHttp.post({

src/components/CXBDialogSignIn/CXBDialogSIgnIn.vue

@@ -130,7 +130,7 @@ function handleSignInSucceedClose() {
              class="absolute "
       ></image>
       <div class="flex flex-col justify-around items-center relative top-10 gap-3 ">
-        <div class="flex gap-2 justify-center items-center mb-4 " v-if="props.day <=6 ">
+        <div class="flex gap-2 justify-center items-center mb-4 p-2" v-if="props.day <=6 ">
           <template v-if="props.day > 0">
 
             <SignRedPacket

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -128,7 +128,7 @@ function handleCountChange(value) {
                   剩余库存{{currentSku.stock}}
                 </div>
                 <div class="flex items-end gap-2" v-if="detail.mer_id === '148'">
-                  {{ currentSku.ot_price * 30 }} 积分
+                  {{ (currentSku.price * 30).toFixed(2) }} 积分
                 </div>
                 <div class="flex items-end gap-2" v-else>
                   <FPrice :price="currentSku.price"/>

src/pages/accumulate-income/index.vue

@@ -12,12 +12,20 @@ const state = reactive({
     value: ''
   }, {
     text: '分享收益',
-    value: 0
+    value: '0'
   }, {
     text: '奖励收益',
-    value: 8
+    value: '8'
   }],
   selectValue: '',
+
+  status: 'noMore',
+
+  currentPage: 1,
+  pageSize: 1000,
+  totalPage: 1,
+
+
   list: [{
     // number: 0.19,
     // title: '分享收益',
@@ -30,18 +38,50 @@ const {windowHeight} = uni.getSystemInfoSync()
 state.scrollHeight = windowHeight - 320
 onLoad((option: any) => {
   if (userStore.uid) {
-    getUserInviteProfitList({
-      pageNum: 1,
-      pageSize: 20,
-      uid: userStore.uid,
-    }).then(res => {
-      accumulateIncome.value = res
-      state.list = res.pageInfo.list
-
-    })
+    loadList('reload')
+    // getUserInviteProfitList({
+    //   pageNum: 1,
+    //   pageSize: 20,
+    //   uid: userStore.uid,
+    // }).then(res => {
+    //   accumulateIncome.value = res
+    //   state.list = res.pageInfo.list
+    //
+    // })
   }
 })
 
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  let params: any = {
+    pageNum: state.currentPage,
+    pageSize: state.pageSize,
+    uid: userStore.uid
+  }
+  if (action === 'reload') {
+    params.pageNum = 1
+  }
+  console.log(state.selectValue)
+  if (state.selectValue == 8 || state.selectValue == 0) {
+    params.commission_type = state.selectValue
+  }
+  getUserInviteProfitList({
+    ...params
+  }).then(res => {
+    accumulateIncome.value = res
+    if (action === 'page') {
+      state.list = state.list.concat(res.pageInfo.list)
+    }
+    if (action === 'reload') {
+      state.list = []
+      state.list = res.pageInfo.list
+    }
+
+    if (callback) {
+      callback(res)
+    }
+  })
+}
 // function loadList()
 </script>
 <template>
@@ -86,7 +126,9 @@ onLoad((option: any) => {
 <!--          全部类型-->
 <!--        </div>-->
         <nut-menu>
-          <nut-menu-item v-model="state.selectValue" :options="state.options" />
+          <nut-menu-item v-model="state.selectValue" :options="state.options"
+                         @change="loadList('reload')"
+          />
         </nut-menu>
         <div class="text-xs">金额</div>
       </div>

src/pages/home/index.vue

@@ -7,7 +7,7 @@ import Announcement from "~/pages/home/components/announcement.vue";
 import Banner from "~/pages/home/components/banner.vue";
 import Header from "~/pages/home/components/header.vue";
 import ProductList from "~/pages/home/components/product-list.vue";
-import {getHomeQuickLink, getLocal, getNoticeList} from "~/apis/common";
+import {getHomeBanner, getHomeQuickLink, getLocal, getNoticeList} from "~/apis/common";
 import {useUserStore} from "~/stores/userStore";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
 import CXBDialogSIgnInSucceed from "~/components/CXBDialogSignInSucceed/CXBDialogSIgnInSucceed.vue";
@@ -22,7 +22,6 @@ usePageStore.setPageConfig({
     url:  '/pages/home/index'
   }
 })
-console.log(usePageStore.currentPage)
 
 // const list = ref([])
 const state = reactive({
@@ -38,8 +37,15 @@ const state = reactive({
   all_yanglao: NaN,
   signToday: NaN,
   isShowSignIn: false,
+  banners: [],
+  announcementList: [],
 
-  announcementList: []
+  indicatorDots: true,
+  circular: true,
+  autoplay: true,
+  interval: 5000,
+  duration: 500,
+  currents: "0",
 })
 onShow(() => {
   usePageStore.setPageConfig({
@@ -63,6 +69,10 @@ onShow(() => {
 })
 onLoad(() => {
   getLocal()
+  getHomeBanner().then(res => {
+    console.log(res)
+    state.banners = res
+  })
   // 加载地址数据
   // orderStore.getCurrentAddress()
   // 1加载首页数据
@@ -71,14 +81,21 @@ onLoad(() => {
   getNoticeList().then(res => {
     state.announcementList = res.list
   })
-  if (userStore.userInfo) {
+  state.page = 1
+  loadProductList()
+})
+onShow(() => {
+  if (userStore.uid) {
     // 2 检查用户签到信息
     getNewSignInInfo().then(res => {
+      console.log(res)
       const {today, day} = res
-      state.signToday = day
+      state.signToday = today
       if (today === 0) {
         state.isShowSignIn = true
       }
+      state.day = day
+
       // // if (today === 0) {
       //   2.1 弹出签到窗口
       // }
@@ -86,10 +103,8 @@ onLoad(() => {
       console.error(error + '->GetNewsSignInInfo')
     })
   }
-  state.page = 1
-  loadProductList()
-})
 
+})
 watch(() => state.isShowSignIn, (val) => {
   val ? uni.hideTabBar() : uni.showTabBar()
 })
@@ -137,11 +152,15 @@ function loadProductList() {
 }
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 
-function handleBannerClick() {
-  uni.navigateTo({
-    url: '/pages/vip/index'
-  })
+function handleBannerClick(item) {
+  if(item.url == 'rich') {
+    uni.navigateTo({
+      url: '/pages/vip/index'
+    })
+  }
 }
+
+
 </script>
 <template>
   <div class="h-screen ">
@@ -149,11 +168,29 @@ function handleBannerClick() {
             :exClass="headerClass"
     />
     <div class="flex flex-col gap-3 ">
-      <image
-          @click="handleBannerClick"
-          :src="homeBanner"
-             mode="widthFix" class="h-60 w-full "
-      ></image>
+<!--      <image-->
+<!--          @click="handleBannerClick"-->
+<!--          :src="homeBanner"-->
+<!--             mode="widthFix" class="h-60 w-full "-->
+<!--      ></image>-->
+
+      <div class="w-screen h-65">
+        <swiper
+            v-if="state.banners"
+            :indicator-dots="state.indicatorDots"
+            indicator-active-color="#e93323"
+            :autoplay="state.autoplay"
+            :circular="state.circular"
+            :interval="state.interval"
+            :duration="state.duration"
+            class="w-full h-full"
+        >
+          <swiper-item v-for="(item, index) in state.banners" :key="index">
+            <image :src="item.pic" @tap="handleBannerClick(item)" class="!w-full !h-full" mode="aspectFill"/>
+          </swiper-item>
+        </swiper>
+      </div>
+
       <Navs/>
 
       <Announcement :list="state.announcementList"/>
@@ -168,6 +205,8 @@ function handleBannerClick() {
   <CXBDialogSIgnIn
       :show="state.isShowSignIn"
       :today="state.signToday"
+      :day="state.day"
+
       @confirm="state.isShowSignIn = false"
       @close="state.isShowSignIn = false"
   />
@@ -177,7 +216,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml" type="home">
+<route lang="yaml"   type="home">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/immediate-withdrawal/index.vue

@@ -67,7 +67,7 @@ watch(() => cashWithdrawalAmount.value, (val) => {
 
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
-  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && Number.parseFloat(userSpreadInfo.value?.brokerage_price) >= widthdrawalConfig.value.widthdrawal_money) {
+  if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
     cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
   } else {
     uni.showToast({
@@ -109,7 +109,7 @@ function handleImmediateWithdrawal() {
   }
 
   // 2 当输入金额≤可提现余额＜最低提现额度
-  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) < widthdrawalConfig.value.withdrawal_money) {
+  if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) && Number.parseFloat(cashWithdrawalAmount.value) < widthdrawalConfig.value.withdrawal_money) {
     // 1 判断是否需要实名
     if (!yanglaojin.value?.is_certification == 1) {
       return uni.navigateTo({

src/pages/invite-partners/index.vue

@@ -113,7 +113,7 @@ page {
 style:
   navigationBarBackgroundColor: "#FD1642"
   navigationBarTextStyle: "white"
-  navigationBarTitleText: 邀请伙伴a
+  navigationBarTitleText: 邀请伙伴
   enablePullDownRefresh: false
 
 </route>

src/pages/miaosha/index.vue

@@ -86,6 +86,12 @@ function handleSeckillDateClick(seckill) {
 }
 
 function handleItemClick(seckillItem) {
+  if (seckillItem.status == 3) {
+    return uni.showToast({
+      title: '本场秒杀已结束~',
+      icon: 'none'
+    })
+  }
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${seckillItem.product_id}`
   })

src/pages/my-integral/detail.vue

@@ -3,20 +3,83 @@ import {getUserSignList} from "~/apis/user";
 import {Ref} from "vue";
 import type {IntegralModel} from "~/apis/model/integral.model";
 const list: Ref<Array<IntegralModel> | undefined> = ref<Array<IntegralModel>>()
+
+const state = reactive({
+  status: 'noMore',
+
+  currentPage: 1,
+  pageSize: 20,
+  totalPage: 1,
+  list: []
+})
 onLoad((option: any) => {
+  // getUserSignList({
+  //   page: 1,
+  //   limit: 10
+  // }).then(res => {
+  //   list.value = res.list
+  //   console.log(res)
+  // })
+
+  loadList('reload')
+})
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action == 'reload') {
+    state.currentPage = 1
+  }
+
   getUserSignList({
-    page: 1,
-    limit: 10
+    page: state.currentPage,
+    limit: state.pageSize
   }).then(res => {
-    list.value = res.list
-    console.log(res)
+    if (action === 'page') {
+      state.list = state.list.concat(res.list)
+    }
+    if (action === 'reload') {
+      state.list = res.list
+    }
+    if (callback) {
+      callback(res)
+    }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+}
+
+function handleScrollToLower() {
+  state.status = "loading";
+  state.currentPage += 1;
+  loadList("page", (items) => {
+    if (!items.length > 0) {
+      console.log("没有更多了");
+      state.status = "noMore";
+      state.currentPage -= 1;
+    }
+  });
+}
+onReachBottom(() => {
+  console.log('到底了。。。')
+
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
   })
 })
+
 </script>
 <template>
-  <div v-if="list && list.length > 0" class="my-3">
+  <div v-if="state.list && state.list.length > 0" class="my-3">
     <div
-        v-for="(item, index) in list"
+        v-for="(item, index) in state.list"
         :key="index"
         class="bg-white f-hairline-bottom text-sm flex flex-row justify-between p-3">
       <div class="flex flex-col gap-1">
@@ -28,10 +91,20 @@ onLoad((option: any) => {
         </div>
       </div>
       <div class="flex flex-col gap-1 items-end">
-        <div class="text-red font-bold">+{{ item.reward_socre }}</div>
+        <div class="text-red font-bold">{{ item.pm == '1' ? '+' : '-' }}{{ item.reward_socre }}</div>
         <div class="text-[11px]">余额 {{ item.surplus }}</div>
       </div>
     </div>
+
+
+    <div class=" flex justify-center items-center text-[12px] text-gray-500" >
+      <div v-if="state.status === 'loading'">
+        加载中...
+      </div>
+      <div v-if="state.status === 'noMore'">
+        没有更多了～
+      </div>
+    </div>
   </div>
 </template>
 

src/pages/my-invitation/index.vue

@@ -120,8 +120,8 @@ function handleShowAgreement() {
 
     </div>
 
-    <div class="bg-white rounded-lg py-3">
-      <FCellGroup divider arrow>
+    <div class="bg-white  ">
+      <FCellGroup divider arrow :ex-class="['rounded-xl']">
         <FCell v-for="(item, index) in list" :key="index" :title="item.title" exClass="text-sm font-bold" @click="handleClick(item)"/>
       </FCellGroup>
     </div>

src/pages/my-relation-merchant/index.vue

@@ -3,8 +3,9 @@ import FSearch from "~/components/FSearch/FSearch.vue";
 import {getMyRelationMerchantList, removeMyRelation} from "~/apis/user";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 const list = ref<any[]>()
-onLoad((option: any) => {
+onShow(() => {
   loadMyRelationMerchantList()
+
 })
 const searchValue = ref('')
 

src/pages/my-reply/index.vue

@@ -1,10 +1,8 @@
 <template>
-  <CXBBasePage>
     <div v-if="list && list.length > 0"></div>
     <div v-else>
       <CXBEmpty />
     </div>
-  </CXBBasePage>
 </template>
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
@@ -22,6 +20,11 @@ onLoad((options)=> {
   })
 } )
 </script>
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>
 <route lang="yaml">
 style:
   navigationBarTitleText: 我的评价

src/pages/order-confirm/index.vue

@@ -99,7 +99,6 @@ onLoad(async (options) => {
 
   }).catch(error => {
     uni.hideLoading()
-    console.log(error + '----')
     uni.showToast({
       title: error,
       icon: 'none'
@@ -140,15 +139,15 @@ function handleSubmit() {
   //     })
   //   }
   // }
-
+  console.log(data.type)
   const paymentData: CreateOrderRequest = {
     cart_id: data.cartId.split(','),
     address_id: data.addressId,
     // 优惠券
     // coupon:
     // pay_type;//支付方式：0: 余额;1: 微信;2: 小程序;4: 支付宝;5: 特殊商户积分
-    // pay_type:  data.type && data.type == '3' ? '5' : 'weixin',
-    pay_type: data.type,
+    pay_type:  data.type && data.type == '3' ? '5' : '2',
+    // pay_type: data.type,
     mer_id: data.type && data.type == '3' ? '148': '',
     // 用户留言
     mark: data.mark,
@@ -170,23 +169,56 @@ function payment(createOrderData: CreateOrderRequest) {
     mask: false
   })
 
-  orderCreate(createOrderData).then(res => {
-    if (res) {
-      // console.log('order_create')
-      console.log(res)
+  if (createOrderData.mer_id == '148') {
+    orderCreate(createOrderData).then(res => {
+      if (res) {
+        uni.hideLoading()
+        console.log(res)
+        // uni.navigateTo({
+        //   url: '/pages/payment/success'
+        // })
+        uni.showToast({
+          title: '积分兑换成功',
+          icon: 'none'
+        }).then(() => {
+          setTimeout(() => {
+            uni.switchTab({
+              url: '/pages/home/index'
+            })
+          }, 500)
+        })
+        // uni.navigateTo({
+          //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
+          // url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
+        // })
+      }
+    }).catch(err => {
       uni.hideLoading()
-      uni.navigateTo({
-        // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
-        url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
+      return uni.showToast({
+        title: err,
+        icon: "none"
       })
-    }
-  }).catch(err => {
-    uni.hideLoading()
-    return uni.showToast({
-      title: err,
-      icon: "none"
     })
-  })
+  } else {
+    orderCreate(createOrderData).then(res => {
+      if (res) {
+        console.log(res)
+        // console.log('order_create')
+        console.log(res)
+        uni.hideLoading()
+        uni.navigateTo({
+          //   // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`
+          url: '/pages/payment/index?' + `pay_price=${res.groupOrder.pay_price}&order_id=${res.order_id}&OrderList=${JSON.stringify(res.groupOrder)}`
+        })
+      }
+    }).catch(err => {
+      uni.hideLoading()
+      return uni.showToast({
+        title: err,
+        icon: "none"
+      })
+    })
+  }
 }
 
 function handleAddressSelect() {
@@ -310,7 +342,7 @@ function reTotal() {
                 </div>
                 <div class="flex justify-between ">
                   <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
-                  <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"></FPrice>
+                  <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"  symbol="积分" position="after"></FPrice>
                   <nut-input-number v-model="orderProductItem.cart_num" @change="(num) => handleNumberChange(num, orderProductItem)"/>
 
                 </div>
@@ -353,7 +385,7 @@ function reTotal() {
       <div class="flex justify-between items-center p-3">
         <div class="flex-1 flex text-sm font-bold">
           应付金额：
-          <FPrice v-if="data.type && data.type == '3'" :price="data.totalPrice * 30"></FPrice>
+          <FPrice v-if="data.type && data.type == '3'" :price="data.totalPrice * 30" symbol="积分" position="after"></FPrice>
          <FPrice  v-else :price="data.totalPrice"></FPrice>
         </div>
         <div class="flex">

src/pages/order/components/ObligationOrderList.vue

@@ -14,6 +14,7 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
+  status: 'noMore',
 
   list: []
 })
@@ -34,7 +35,6 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     page: state.currentPage,
     limit: state.pageSize
   }).then(res => {
-    console.log(res)
     if (action === 'page') {
       state.list = state.list.concat(res.list)
     }

src/pages/order/components/OrderItem.vue

@@ -178,7 +178,7 @@ function handleProductItemClick(
 function handeRefund(orderItem) {
   uni.navigateTo({
     // url: `/pages/refund/drawback?detail=${encodeBase64(orderItem)}`
-    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}`
+    url: `/pages/refund/option?detail=${encodeBase64(orderItem)}&from=${props.tabValue}`
   })
 }
 
@@ -192,7 +192,7 @@ function handleShowObligationOrderDetail(orderItem) {
 <template>
   <div class="bg-white rounded p-3">
     <div
-        @stop.stop="handleHeaderClick"
+        @tap.stop="handleHeaderClick"
         class="flex items-center justify-between f-hairline-bottom pb-3">
       <div class="flex items-center font-bold gap-2 text-sm justify-between">
         <div class="flex-1 flex items-center gap-2">
@@ -266,10 +266,10 @@ function handleShowObligationOrderDetail(orderItem) {
       </div>
 
       <div v-else  @tap.stop="handleShowOrderDetail(orderItem)">
-        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex">
+        <div v-for="(orderProduct, orderProductIndex) in orderItem.orderProduct" :key="orderProductIndex" class="flex flex-col gap-3">
           <div class="flex py-2 gap-3">
             <div class="flex-1 flex gap-2">
-              <div class="flex w-20 h-20">
+              <div class="flex w-20">
                 <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
 
               </div>
@@ -290,29 +290,31 @@ function handleShowObligationOrderDetail(orderItem) {
             </div>
 
           </div>
-          <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
-            <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
-            <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
-          </div>
-          <div class="flex justify-end gap-2" v-if="orderItem.status == 0">
-            <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
-            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
-          </div>
+        </div>
+
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
+          <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+          <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+
+        </div>
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 0">
+          <nut-button size="small" type="default" @tap.stop="handleRemindTheDelivery"><div class="text-black">提醒发货</div></nut-button>
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+        </div>
 
-          <div class="flex justify-end gap-2" v-if="orderItem.status == 1">
-            <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
-            <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 1">
+          <nut-button size="small" plain type="default" @tap.stop="handleShowLogistics(orderItem)">查看物流</nut-button>
+          <nut-button size="small" plain type="default" @tap.stop="handeRefund(orderItem)">申请售后</nut-button>
 
-            <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
+          <nut-button size="small" plain type="primary" @tap.stop="handleTakeOrder(orderItem)">确认收货</nut-button>
 
-          </div>
+        </div>
 
-          <div class="flex justify-end gap-2" v-if="orderItem.status == 2">
-            <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderItem)">再次购买</nut-button>
-            <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderItem)">去评价</nut-button>
+        <div class="flex justify-end gap-2" v-if="orderItem.status == 2">
+          <nut-button size="small" plain type="default" @tap.stop="handleProductItemClick(orderItem)">再次购买</nut-button>
+          <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderItem)">去评价</nut-button>
 
-          </div>
         </div>
       </div>
     </div>

src/pages/order/components/OrderObligationItem.vue

@@ -208,7 +208,7 @@ function handleShowObligationOrderDetail(orderItem) {
 
     <div>
       <div v-if="orderItem.orderList" @tap.stop="handleShowObligationOrderDetail(orderItem)">
-        <div v-for="(order, index) in orderItem.orderList" :key="index">
+        <div v-for="(order, index) in orderItem.orderList" :key="index" class="flex flex-col gap-3">
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
             <div class="flex py-2 gap-3">
               <div class="flex-1 flex gap-2">
@@ -227,19 +227,19 @@ function handleShowObligationOrderDetail(orderItem) {
               </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>-->
-                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+                <FPrice :price="orderProduct.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" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
-              <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
 
-            </div>
           </div>
         </div>
+        <div class="flex justify-end gap-2">
+          <nut-button size="small" type="default" @tap.stop="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+          <nut-button size="small" plain type="primary" @tap.stop="handlePayment">立即支付</nut-button>
+
+        </div>
 
       </div>
     </div>

src/pages/order/index.vue

@@ -1,5 +1,6 @@
 <template>
 <!--  <CXBBasePage>-->
+  <div class="bg-white">
   <FNavBar
       title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
       ex-class="bg-white w-screen"
@@ -9,7 +10,7 @@
 
   <!--    <nut-navbar>-->
     <!--      <template #content>-->
-    <div class="fixed top-20 bg-white w-full z-2">
+    <div class="fixed top-18 bg-white w-full z-2">
       <nut-tabs v-model="state.tabvalue" class="bg-white">
         <nut-tab-pane title="全部"></nut-tab-pane>
         <nut-tab-pane title="待付款"></nut-tab-pane>
@@ -19,14 +20,14 @@
       </nut-tabs>
     </div>
 
-    <div class="mt-32  pb-safe">
+    <div class="mt-30  pb-safe bg-[#f8f8f8]">
       <AllItemList v-if="state.tabvalue == 0" :tab-value="0"/>
       <ObligationOrderList v-if="state.tabvalue == 1" :tab-value="1"/>
       <Order2List v-if="state.tabvalue == 2" :status="'0'"/>
       <Order3List v-if="state.tabvalue == 3" :status="'1'"/>
       <Order4List v-if="state.tabvalue == 4" :status="'2'"/>
     </div>
-
+</div>
 <!--  </CXBBasePage>-->
 </template>
 <script lang="ts" setup>

src/pages/order/obligation-detail.vue

@@ -22,6 +22,7 @@ onLoad((options) => {
   // console.log(options.detail)
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
+    console.log(detail.value)
     // console.log(detail.value)
   // detail.value = JSON.parse(decodeBase64(base64Json))
   }
@@ -192,11 +193,14 @@ function handleProductItemClick(
           <image :src="detail.merchant.mer_avatar" mode="widthFix" class="w-5 h-5"></image>
           <div>{{ detail.merchant.mer_name }}</div>
         </div>
-        <div v-for="(order, index) in detail.orderList" :key="index">
+        <div v-for="(order, index) in detail.orderList" :key="index" class="flex flex-col gap-3">
           <div v-for="(orderProduct, orderProductIndex) in order.orderProduct" :key="orderProductIndex">
-            <div class="flex py-2 gap-3">
+            <div class="flex p-2 gap-3">
               <div class="flex-1 flex gap-2"  @tap.stop="handleProductItemClick(orderProduct)">
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                <div class="w-20 h-20 flex">
+                  <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+
+                </div>
 
                 <div class="flex flex-col">
                   <div class="line-clamp-2 text-[12px]"
@@ -212,7 +216,7 @@ function handleProductItemClick(
 
               <div class="flex flex-col justify-center items-center">
 <!--                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
-                <FPrice :price="detail.total_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+                <FPrice :price="orderProduct.product_price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 

src/pages/order_addcart/index.vue

@@ -53,12 +53,12 @@ onLoad((options) => {
   loadCartList()
 })
 onShow(() => {
-  // pageStore.setPageConfig({
-  //   orderBack: {
-  //     type: 'tab',
-  //     url:  '/pages/order_addcart/index'
-  //   }
-  // })
+  pageStore.setPageConfig({
+    orderBack: {
+      type: 'tab',
+      url:  '/pages/order_addcart/index'
+    }
+  })
   if (!state.isManage) {
     state.isManage = true
   }
@@ -203,7 +203,8 @@ function cartAllCheck(type: 'single' | 'all') {
   let totalMoney = 0
   let totalNum = 0
   state.currentType = type
-
+  // 解决下单多次
+  state.cart_id = []
   // console.log(type)
   shopping.value?.list.forEach((goods, index) => {
     if (type === 'single') {

src/pages/payment/index.vue

@@ -4,35 +4,35 @@
       ex-class="bg-white w-screen"
       @click-left="onClickLeft"
   />
-    <div class="w-full mt-20">
-      <div class=" flex flex-col gap-3 p-3">
-        <div class="flex flex-col justify-center items-center bg-white rounded p-4">
-          <div class="text-xs text-gray-500">支付金额</div>
-          <FPrice :price="state.payPrice" ex-class="!text-xl font-bold"></FPrice>
+  <div class="w-full mt-20">
+    <div class=" flex flex-col gap-3 p-3">
+      <div class="flex flex-col justify-center items-center bg-white rounded p-4">
+        <div class="text-xs text-gray-500">支付金额</div>
+        <FPrice :price="state.payPrice" ex-class="!text-xl font-bold"></FPrice>
+      </div>
+      <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
+        <div class="flex f-hairline-bottom text-sm pb-2">
+          支付方式
         </div>
-        <div class="bg-white rounded-lg text-sm p-3 flex flex-col">
-          <div class="flex f-hairline-bottom text-sm pb-2">
-            支付方式
-          </div>
-          <div>
-            <div class="flex items-center justify-between py-3">
-              <div class="flex items-center gap-2">
-                <image :src="wxLogoImage" mode="widthFix" class="w-8 h-8"></image>
-                <div>微信支付</div>
-              </div>
+        <div>
+          <div class="flex items-center justify-between py-3">
+            <div class="flex items-center gap-2">
+              <image :src="wxLogoImage" mode="widthFix" class="w-8 h-8"></image>
+              <div>微信支付</div>
             </div>
           </div>
         </div>
       </div>
+    </div>
 
 
-      <div class="fixed bottom-0 pb-safe  w-full">
-        <div class="px-3">
-          <nut-button block type="primary" @click="handleConfirm">立即支付</nut-button>
-        </div>
-
+    <div class="fixed bottom-0 pb-safe  w-full">
+      <div class="px-3">
+        <nut-button block type="primary" @click="handleConfirm">立即支付</nut-button>
       </div>
+
     </div>
+  </div>
 </template>
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
@@ -101,7 +101,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({
@@ -125,7 +126,7 @@ function onClickLeft() {
     confirmColor: '#FE0032',
     confirmText: '继续支付',
     cancelText: '确认离开',
-    success: (res) =>  {
+    success: (res) => {
       if (res.confirm) {
         handleConfirm()
         uni.$emit('cart-reload')
@@ -146,19 +147,25 @@ function onClickLeft() {
             }
           })
         }
-        setTimeout(() => {
-          if (state.tabIndex) {
-            uni.navigateTo({
-              url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
-            })
-          } else {
-            uni.navigateTo({
-              url: `/pages/order/index?tabIndex=1&from=payment`,
-            })
-          }
-          // const tabIndex =
-
-        }, 300)
+        // setTimeout(() => {
+        if (state.tabIndex == 0) {
+          uni.navigateTo({
+            url: '/pages/order/index'
+          })
+        }
+        if (state.tabIndex > 0) {
+
+          uni.navigateTo({
+            url: `/pages/order/index?tabIndex=${state.tabIndex}&from=payment`,
+          })
+        } else {
+          uni.navigateTo({
+            url: `/pages/order/index?tabIndex=1&from=payment`,
+          })
+        }
+        // const tabIndex =
+
+        // }, 300)
 
       }
     },

src/pages/payment/success.vue

@@ -1,21 +1,37 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import FNavBar from "~/components/FNavBar/FNavBar.vue";
 
 const icon = 'https://cdn.bjtdba.com/vod/image/2023-09-21/20230921160115229.png'
+function onClickLeft() {
+  uni.redirectTo({
+    url: '/pages/my-integral/index'
+  })
+}
 </script>
 
 <template>
-<CXBBasePage>
-  <div class="flex flex-col h-screen w-screen items-center pt-20">
+<!--<CXBBasePage>-->
+  <FNavBar
+      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
+      ex-class="bg-white w-screen"
+      @click-left="onClickLeft"
+  />
+
+
+  <div class="flex flex-col h-screen w-screen items-center mt-20 pt-20">
 
     <image :src="icon" mode="widthFix" class="w-40"></image>
     <div>支付成功</div>
   </div>
-</CXBBasePage>
+<!--</CXBBasePage>-->
 </template>
 
 
 <route lang="yaml">
 style:
+  navigationStyle: custom
   navigationBarTitleText: 支付成功
+  enablePullDownRefresh: false
+
 </route>

src/pages/product/test.json

@@ -0,0 +1,24 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": {
+    "address_id": "339",
+    "uid": "420",
+    "real_name": "石头",
+    "phone": "15357047038",
+    "province": "北京",
+    "city": "北京市",
+    "city_id": "67449",
+    "district": "顺义区",
+    "village": "光明街道",
+    "village_id": "493",
+    "detail": "临河悦园8号楼一单元1203",
+    "post_code": "0",
+    "longitude": "0",
+    "latitude": "0",
+    "is_default": "1",
+    "is_del": "0",
+    "create_time": "2023-09-26 14:40:40",
+    "code_list": "1,67449,35,493"
+  }
+}

src/pages/product/test1.json

@@ -0,0 +1,22 @@
+{
+  "status": 200,
+  "message": "success",
+  "data": {
+    "address_id": "31",
+    "uid": "420",
+    "real_name": "记得记得",
+    "phone": "15810674432",
+    "province": "北京",
+    "city": "北京市",
+    "city_id": "2",
+    "district": "顺义区",
+    "detail": "记得记得",
+    "post_code": "0",
+    "longitude": "0",
+    "latitude": "0",
+    "is_default": "1",
+    "is_del": "0",
+    "create_time": "2022-12-08 11:54:49",
+    "code_list": "1,67449,35,493"
+  }
+}

src/pages/red-integral/index.vue

@@ -135,7 +135,7 @@ function handleImmediateWithdrawal() {
                   <div class="text-sm" v-if="userStore.userInfo">
                     {{ userStore.userInfo.nickname ? userStore.userInfo.nickname : '登录' }}
                   </div>
-                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-12 h-5 justify-center items-center px-2">
+                  <div class="flex rounded-full border border-solid border-1px border-yellow text-[12px] text-white w-fit h-5 justify-center items-center px-2">
                     {{userType}}
                   </div>
                 </div>

src/pages/refund/drawback.vue

@@ -14,7 +14,8 @@ const state = reactive({
   showReasonPopup: false,
   // detail: {}
   total_price: '0.00',
-  orderId: ''
+  orderId: '',
+  from: '',
 
 })
 const userStore = useUserStore()
@@ -56,6 +57,9 @@ function handleUploadSuccess({ data, option, fileItem }) {
   // console.log(fileItem)
 }
 onLoad(async (options) => {
+  if (options && options.from !== '') {
+    state.from = options.from
+  }
   await userStore.getUserInfo()
   formData.refund_type = options.refund_type
   formData.ids = options.ids
@@ -84,14 +88,14 @@ function handleSubmit() {
     confirmColor: '#FE0032',
     success: function (res) {
       if (res.confirm) {
-        refundApply(state.orderId, formData).then(res => {
+        refundApply(state.orderId.toString(), formData).then(res => {
           // {"status":200,"message":"申请退款成功","data":{"refund_order_id":"671"}}
           uni.showToast({
             title: '申请退款成功'
           })
           setTimeout(() => {
             uni.navigateTo({
-              url: '/pages/refund/index'
+              url: `/pages/refund/index?from=${state.from}`
             })
           }, 300)
         })

src/pages/refund/index.vue

@@ -2,6 +2,7 @@
 import {refundList} from "~/apis/order.api";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import RefundOrderItem from "~/pages/order/components/RefundOrderItem.vue";
+import FNavBar from "~/components/FNavBar/FNavBar.vue";
 
 const state = reactive({
   tabvalue: 0,
@@ -14,14 +15,22 @@ const state = reactive({
   totalPage: 1,
 
   status: 'noMore',
+
+  from: null
 })
 
-onLoad(() => {
+onLoad((options) => {
+  if (options && options.from) {
+    state.from = options.from
+  }
   loadList('reload')
 })
 
 
 function loadList(action: 'page' | 'reload',  callback?: (items) => void) {
+  if (action == 'reload') {
+    state.list = []
+  }
   const params = {
     page: state.currentPage,
     limit: state.pageSize,
@@ -79,71 +88,64 @@ function handleTabChange(	{title,paneKey,disabled}) {
     loadList('reload')
   }
 }
+
+function onClickLeft() {
+
+  if (state.from) {
+    uni.navigateTo({
+      url: '/pages/order/index?tabIndex=' + state.from
+    })
+  } else {
+    uni.navigateBack()
+  }
+}
 </script>
 <template>
-  <div>
-    <nut-tabs v-model="state.tabvalue" @change="handleTabChange">
-      <nut-tab-pane title="全部">
-          <div v-if="state.list.length > 0" class="flex flex-col">
-            <div v-for="(orderItem, index) in state.list" :key="index">
-              <RefundOrderItem :order-item="orderItem"/>
-            </div>
-            <div class=" flex justify-center items-center text-[12px] text-gray-500" >
-              <div v-if="state.status === 'loading'">
-                加载中...
-              </div>
-              <div v-if="state.status === 'noMore'">
-                没有更多了～
-              </div>
-            </div>
-          </div>
-          <CXBEmpty v-else/>
-      </nut-tab-pane>
-      <nut-tab-pane title="退款中">
-        <div v-if="state.list.length > 0" class="flex flex-col gap-3">
-          <div v-for="(orderItem, index) in state.list" :key="index">
-            <RefundOrderItem :order-item="orderItem"/>
-          </div>
-          <div class=" flex justify-center items-center text-[12px] text-gray-500" >
-            <div v-if="state.status === 'loading'">
-              加载中...
-            </div>
-            <div v-if="state.status === 'noMore'">
-              没有更多了～
-            </div>
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-      </nut-tab-pane>
-      <nut-tab-pane title="退款完成">
-        <div v-if="state.list.length > 0" class="flex flex-col gap-3">
-          <div v-for="(orderItem, index) in state.list" :key="index">
-            <RefundOrderItem :order-item="orderItem"/>
-          </div>
-          <div class=" flex justify-center items-center text-[12px] text-gray-500" >
-            <div v-if="state.status === 'loading'">
-              加载中...
-            </div>
-            <div v-if="state.status === 'noMore'">
-              没有更多了～
-            </div>
-          </div>
-        </div>
-        <CXBEmpty v-else/>
-      </nut-tab-pane>
+  <FNavBar
+      title="我的订单" :left-arrow="true" fixed placeholder z-index="999"
+      ex-class="bg-white w-screen"
+      @click-left="onClickLeft"
+  />
+  <div class="fixed top-18 bg-white w-full z-2">
+    <nut-tabs v-model="state.tabvalue" class="bg-white" @change="handleTabChange">
+      <nut-tab-pane title="全部"></nut-tab-pane>
+      <nut-tab-pane title="退款中"></nut-tab-pane>
+      <nut-tab-pane title="退款完成"></nut-tab-pane>
     </nut-tabs>
   </div>
+  <div v-if="state.list.length > 0" class="mt-30 flex flex-col p-3">
+    <div v-for="(orderItem, index) in state.list" :key="index">
+      <RefundOrderItem :order-item="orderItem"/>
+    </div>
+    <div class=" flex justify-center items-center text-[12px] text-gray-500" >
+      <div v-if="state.status === 'loading'">
+        加载中...
+      </div>
+      <div v-if="state.status === 'noMore'">
+        没有更多了～
+      </div>
+    </div>
+  </div>
+  <CXBEmpty v-else/>
+
 </template>
 <route lang="yaml">
 style:
   navigationBarTitleText: 退款/售后
+  navigationStyle: custom
+
 </route>
 
 <style>
 page {
   background: #f8f8f8;
 }
+
+.nut-tabs__titles {
+  background: white !important;
+}
+
 .nut-tab-pane {
-  background: #f8f8f8 !important;
+  display: none !important;
 }
 </style>

src/pages/revenue-sharing/index.vue

@@ -208,12 +208,12 @@ onReachBottom(() => {
 
 
     </div>
-    <div class="px-3 py-3 flex flex-col gap-3 pt-45 pb-safe">
-      <div>
-        <div v-if="state.list && state.list.length > 0" class="  gap-3 flex flex-col">
-          <div class="bg-white p-3">
+    <div class="px-3 py-3 flex flex-col gap-3 mt-45 pb-safe bg-[#f8f8f8] h-full">
+        <div v-if="state.list && state.list.length > 0" class=" ">
+          <div class="   flex flex-col gap-3">
             <div v-for="(item, index) in state.list" :key="index"
                  @click="handleItemClick(item)"
+                 class="bg-white rounded p-3"
             >
               <div class="flex flex-col">
                 <div class="flex justify-between text-gray text-xs items-center f-hairline-bottom pb-3">
@@ -255,7 +255,6 @@ onReachBottom(() => {
         </div>
 
         <CXBEmpty v-else/>
-      </div>
 
     </div>
   </div>
@@ -271,6 +270,5 @@ style:
 <style>
 page {
   background: #f8f8f8;
-  overflow: hidden;
 }
 </style>

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

@@ -11,6 +11,7 @@ import {DcProductModel} from "~/apis/model/dacang.model";
 import {encodeBase64} from "~/utils/http/helper";
 
 interface ProductDetail {
+  mer_id: '',
   product_id: '',
   type: string
   image: string
@@ -38,6 +39,9 @@ const props = defineProps({
   // ...styleProps
 })
 
+const is148Merchant = computed(() => {
+  return props.item.mer_id && props.item.mer_id == '148'
+})
 
 </script>
 
@@ -63,7 +67,11 @@ const props = defineProps({
         </div>
       </div>
       <div class="flex flex-row items-center gap-2">
-        <div class="flex text-[#FE0032] font-bold text-lg">
+        <div v-if="is148Merchant && item.price" class="flex justify-end items-end gap-2 text-[#FE0032]">
+          <div class="!text-[24px]">{{ Number.parseFloat(item.price * 30).toFixed(2) }} </div>
+          <div class="text-sm">积分</div>
+        </div>
+        <div class="flex text-[#FE0032] font-bold text-lg" v-else>
           <div>
             ￥
           </div>
@@ -71,11 +79,13 @@ const props = defineProps({
             {{ item.price }}
           </div>
         </div>
-      </div>
 
-      <div class="line-through text-xs font-bold flex " v-if="item.ot_price">
-          ¥ {{item.ot_price}}
       </div>
+      <div class="line-through text-xs font-bold flex " v-if="item.ot_price && !is148Merchant">
+        ¥ {{item.ot_price}}
+      </div>
+
+
     </div>
   </div>
 </template>

src/pages/store/home/index.vue

@@ -71,6 +71,10 @@ onLoad((options: any) => {
   }
 })
 
+const is148Merchant = computed(() => {
+  return merchant.value && merchant.value.mer_id && merchant.value.mer_id == '148'
+})
+
 // onShow(() => {
 //
 // })

src/pages/store/nearby/index.vue

@@ -54,6 +54,7 @@ onLoad(() => {
   getSelectMerchantSort().then(res => {
     state.merchantCategory = res.merchantCategory
   })
+  loadAll()
 
   // loadSelectMerchant('reload')
 })
@@ -65,7 +66,6 @@ onShow(() => {
       url:  '/pages/store/nearby/index'
     }
   })
-  loadAll()
 
 })
 

src/pages/store/product/detail.json

@@ -1,132 +0,0 @@
-{
-  "status": 200,
-  "message": "success",
-  "data": {
-    "product_id": "4858",
-    "mer_id": "321",
-    "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
-    "slider_image": [
-      "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg"
-    ],
-    "store_name": "壳子妃子玫瑰红葡萄干235gS011 香槟黄 香槟黄",
-    "store_info": "1",
-    "unit_name": "个",
-    "price": "29.10",
-    "cost": "26.46",
-    "ot_price": "67.00",
-    "stock": "1000",
-    "sales": 100,
-    "video_link": "",
-    "product_type": "0",
-    "type": "5",
-    "dc_price": "29.90",
-    "seckill": "1",
-    "isRelation": false,
-    "sku": {
-      "默认": {
-        "sku": "默认",
-        "price": "29.10",
-        "stock": "100",
-        "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
-        "bar_code": "",
-        "weight": "0.00",
-        "volume": "0.00",
-        "ot_price": "67.00",
-        "unique": "6b0753bbacf0",
-        "dacang": "29.90"
-      }
-    },
-    "replayData": {
-      "best": 0,
-      "rate": "",
-      "count": 0
-    },
-    "unique": "6b0753bbacf0",
-    "attr": [
-      {
-        "product_id": "4858",
-        "attr_name": "规格",
-        "attr_values": [
-          "默认"
-        ],
-        "type": "0",
-        "attr_id": null,
-        "attr_value": [
-          {
-            "attr": "默认",
-            "check": false
-          }
-        ]
-      }
-    ],
-    "yanglao": "1.49",
-    "product_count": 89,
-    "merchant_type": "3",
-    "seckill_date_end": "2023-08-22 18:00:00",
-    "seckill_s": 0,
-    "content": {
-      "product_id": "4858",
-      "content": "<img src='https:\/\/img.yunzhonghe.com\/image\/1594102142038jrPEvcMTXF.jpg'>",
-      "type": "0"
-    },
-    "topReply": null,
-    "merchant": {
-      "mer_id": "321",
-      "mer_name": "大仓创客",
-      "mer_avatar": "https:\/\/app.bjtdba.com\/uploads\/def\/20220428\/d616961db8aefbe92f72972a1d7db88a.png",
-      "product_score": "3.8",
-      "service_score": "3.6",
-      "postage_score": "3.6",
-      "service_phone": "13260336036",
-      "care_count": "11",
-      "business_id": "0",
-      "sxy_submerchant_id": "895152791",
-      "im": {
-        "im": "0",
-        "im_uuid": null,
-        "account": "12222222222"
-      },
-      "recommend": [
-        {
-          "mer_id": "321",
-          "product_id": "6183",
-          "store_name": "苏泊尔（SUPOR）ZMD安心系列 智能电饭煲电饭锅 5L容量 球釜内胆 多功能智能预约 香槟金色CFXB50FC59-75",
-          "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/52232\/37\/17532\/79491\/63282471Ec5d2ca36\/7c12d780f0be4a38.jpg",
-          "price": "240.79",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "279.00",
-          "yanglao": "5.47"
-        },
-        {
-          "mer_id": "321",
-          "product_id": "6193",
-          "store_name": "瑞士宾爵手表钟表高端绿面钢带防水配饰女表B1530L",
-          "image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/16396d71ec8e4552a5530b33f517a344.jpg",
-          "price": "251.55",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "1217.00",
-          "yanglao": "5.71"
-        },
-        {
-          "mer_id": "321",
-          "product_id": "6201",
-          "store_name": "瑞士宾爵手表钟表小方表轻奢时尚配饰女表B1020L",
-          "image": "https:\/\/oss-hxq-prod.szbaoly.com\/bjsc\/goods\/1d66a54c8c454ece98e1b042adf093f3.jpg",
-          "price": "247.56",
-          "is_show": "1",
-          "status": "1",
-          "is_gift_bag": "0",
-          "is_good": "0",
-          "ot_price": "2980.00",
-          "yanglao": "5.62"
-        }
-      ]
-    }
-  }
-}

src/pages/store/product/detail.vue

@@ -62,6 +62,12 @@ const state = reactive({
 const detail: any = ref(null)
 
 onShow(() => {
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
+  loadProductDetail()
+
   usePageStore.setPageConfig({
     orderBack: {
       type: 'page',
@@ -89,7 +95,6 @@ onLoad((option: any) => {
     state.recommendList = res.list
   })
 
-  loadProductDetail()
 })
 
 function loadProductDetail() {
@@ -104,6 +109,7 @@ function loadProductDetail() {
     state.isRelation = res.isRelation
     // if (detail.value.mer_id === '148') {
     // }
+    uni.hideLoading()
   }).catch(error => {
     // console.log(error)
     uni.showToast({
@@ -446,7 +452,6 @@ function handleShowCustomer() {
 
       <div
           class="flex flex-col p-3 gap-3"
-          v-if="!detail.seckill == 1"
       >
         <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">

src/pages/store/product/other.vue

@@ -49,6 +49,9 @@ const props = defineProps({
   }
 })
 
+const state = reactive({
+  data: {}
+})
 const detail = ref<IProductDetail>()
 onLoad((options: any) => {
 
@@ -56,12 +59,15 @@ onLoad((options: any) => {
   // console.log(data)
   mergeProductDetail(data)
   // if (options.platform && options.id) {
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
   loadProductDetail(data)
   // }
 })
 onShow(() => {
   isSubmit.value = false
-
 })
 
 function mergeProductDetail(data: Partial<IProductDetail> = {}) {
@@ -80,6 +86,8 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         },
         ...jdProduct
       })
+
+      uni.hideLoading()
     })
   }
   // 淘宝
@@ -94,6 +102,8 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         },
         ...product
       })
+      uni.hideLoading()
+
     })
   }
 
@@ -124,6 +134,9 @@ function loadProductDetail(product: Partial<IProductDetail>) {
           coupon: null
         })
       }
+
+      uni.hideLoading()
+
     })
   }
 
@@ -148,6 +161,9 @@ function loadProductDetail(product: Partial<IProductDetail>) {
           }
         })
       }
+
+      uni.hideLoading()
+
     })
   }
   // 苏宁
@@ -158,6 +174,9 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         images: res.detail,
         ...res
       })
+
+      uni.hideLoading()
+
     })
   }
   // 抖音
@@ -169,7 +188,12 @@ function loadProductDetail(product: Partial<IProductDetail>) {
         images: res.imgs,
         ...res
       })
+
+      uni.hideLoading()
+
     })
+
+
   }
 }
 function handleBuyNow() {
@@ -181,83 +205,68 @@ function handleBuyNow() {
       url: '/pages/user/login/index'
     })
   }
-    // debounce(() => {
-    //   console.log('debounce.....')
-    // }, 300)
-    // _debounce(() => {
-    //   return uni.navigateTo({
-    //     url: '/pages/user/login/index'
-    //   })
-    // }, 300)
-
-    // console.log('没登录')
-    // return _debounce(() => {
-    //     return uni.navigateTo({
-    //       url: '/pages/user/login/index'
-    //     })
-    // }, 300)
-  // 京东
-  if (detail.value?.platform == 6 && detail.value?.materialUrl) {
-    // console.log(detail.value?.spreadUrl)
-    console.log(detail.value)
-    if (detail.value && detail.value.materialUrl) {
-      uni.navigateToMiniProgram({
-        appId: 'wx91d27dbf599dff74',
-        // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
-        path: 'pages/union/proxy/proxy?spreadUrl=' + detail.value.materialUrl,
-        extraData: {
-          foo: 'bar'
-        },
-        envVersion: 'release',
-        success(res) {
-          // 打开成功
-          console.log(res);
-        },
-        fail: (error) => {
-          console.log(error);
-        }
-      })
+  if (detail.value?.platform) {
+    // 京东
+    if (detail.value?.platform == 6 && detail.value?.materialUrl) {
+      // console.log(detail.value?.spreadUrl)
+      console.log(detail.value)
+      if (detail.value && detail.value.materialUrl) {
+        uni.navigateToMiniProgram({
+          appId: 'wx91d27dbf599dff74',
+          // path: 'pages/union/proxy/proxy?spreadUrl=' + encodeURIComponent(detail.value?.spreadUrl),
+          path: 'pages/union/proxy/proxy?spreadUrl=' + detail.value.materialUrl,
+          extraData: {
+            foo: 'bar'
+          },
+          envVersion: 'release',
+          success(res) {
+            // 打开成功
+            console.log(res);
+          },
+          fail: (error) => {
+            console.log(error);
+          }
+        })
+      } else {
+        return uni.showToast({
+          title: '跳转失败请重试',
+          icon: 'none'
+        })
+      }
+    } else if (detail.value?.platform == 1) {
+      // console.log(detail.value)
+      const pddWx = detail.value.pddlink.wx
+      if (pddWx) {
+        uni.navigateToMiniProgram({
+          appId: pddWx.app_id,
+          path: pddWx.page_path,
+          // extraData: {
+          //  foo: 'bar'
+          // },
+          envVersion: 'release',
+          success(res) {
+            // 打开成功
+            console.log(res);
+          },
+          fail: (error) => {
+            console.log(error);
+          }
+        })
+
+      } else {
+        uni.showToast({
+          title: '跳转失败请重试',
+          icon: 'none'
+        })
+      }
+      // console.log(detail.value.pddlink)
+      // console.log(pddWx)
     } else {
       return uni.showToast({
-        title: '跳转失败请重试',
-        icon: 'none'
-      })
-    }
-  }
-  else if (detail.value?.platform == 1) {
-    // console.log(detail.value)
-    const pddWx = detail.value.pddlink.wx
-    if (pddWx) {
-      uni.navigateToMiniProgram({
-        appId: pddWx.app_id,
-        path: pddWx.page_path,
-        // extraData: {
-        //  foo: 'bar'
-        // },
-        envVersion: 'release',
-        success(res) {
-          // 打开成功
-          console.log(res);
-        },
-        fail: (error) => {
-          console.log(error);
-        }
-      })
-
-    } else  {
-      uni.showToast({
-        title: '跳转失败请重试',
+        title: '商品维护中，请稍后再试',
         icon: 'none'
       })
     }
-    // console.log(detail.value.pddlink)
-    // console.log(pddWx)
-  }
-  else {
-    return uni.showToast({
-      title: '商品维护中，请稍后再试',
-      icon: 'none'
-    })
   }
   /*
   if (detail.value?.platform == 3) {

src/pages/store/product/test.json

@@ -1,74 +0,0 @@
-{
-  "status": 200,
-  "message": "success",
-  "data": [
-    {
-      "seckill_date": "22日17:00已结束",
-      "ctime": "2023-02-15 01:00:00",
-      "product_id": "4508",
-      "status": "1",
-      "product_data": [
-        {
-          "mer_id": "321",
-          "product_id": "4508",
-          "store_name": "韩后熬夜甜睡修护面膜135ml 免洗睡眠面膜补水保湿深层滋养男女可用",
-          "image": "https:\/\/img13.360buyimg.com\/n12\/jfs\/t1\/219531\/21\/20940\/41092\/6311db6bE054cabee\/ed882adff197adfb.jpg",
-          "ot_price": "109.00",
-          "seckill_price": "24.80",
-          "yanglao": "1.24",
-          "status": 3,
-          "img_text": "已结束"
-        },
-        {
-          "mer_id": "321",
-          "product_id": "4858",
-          "store_name": "壳子妃子玫瑰红葡萄干235gS011 香槟黄 香槟黄",
-          "image": "https:\/\/img.yunzhonghe.com\/image\/1594102082351snWdknfIaZ.jpg",
-          "ot_price": "67.00",
-          "seckill_price": "29.90",
-          "yanglao": "1.49",
-          "status": 3,
-          "img_text": "已结束"
-        }
-      ]
-    },
-    {
-      "seckill_date": "22日21:00已结束",
-      "ctime": "2023-02-14 01:00:00",
-      "product_id": "4957",
-      "status": 3,
-      "product_data": [
-        {
-          "mer_id": "321",
-          "product_id": "4957",
-          "store_name": "云南白药清逸堂携爽舒缓棒（简装）  黑  ",
-          "image": "https:\/\/img.yunzhonghe.com\/image\/1649999225845LKCOiTiTOm.jpg",
-          "ot_price": "59.00",
-          "seckill_price": "28.90",
-          "yanglao": "1.44",
-          "status": 3,
-          "img_text": "已结束"
-        }
-      ]
-    },
-    {
-      "seckill_date": "14日14:00已结束",
-      "ctime": "2023-09-14 14:28:33",
-      "product_id": "6103",
-      "status": "1",
-      "product_data": [
-        {
-          "mer_id": "465",
-          "product_id": "6103",
-          "store_name": "测试001商品",
-          "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-09\/3e1a8202309091612417658.jpg",
-          "ot_price": "200.00",
-          "seckill_price": "10.00",
-          "yanglao": "0.50",
-          "status": 3,
-          "img_text": "已结束"
-        }
-      ]
-    }
-  ]
-}

src/pages/user/address/create-4-level.vue

@@ -84,7 +84,9 @@ export default {
       phone: '',
       address: [],
       is_default: false,
-      code_list: ''
+      code_list: '',
+      village: '',
+      village_id: ''
     });
     const state = reactive({
       cartId: '', // 购物车 id
@@ -108,8 +110,8 @@ export default {
       country: '',
       countryId: '',
       // 街道
-      village: '',
-      villageId: ''
+      // village: '',
+      // villageId: ''
     });
 
     const addressData = reactive({
@@ -155,7 +157,7 @@ export default {
       getUserAddressDetail(state.addressId).then(res => {
         // console.log(res)
         // let region = [res.province, res.city, res.district]
-        formData.address = [res.province, res.city, res.district]
+        formData.address = [res.province, res.city, res.district, res.town]
         // state.cityId = res.city_id
         formData.address_id = res.address_id
         formData.uid = res.uid
@@ -168,8 +170,8 @@ export default {
         // console.log(formData.address)
         formData.is_default = res.is_default == '1'
         formData.code_list = res.code_list
-        formData.village = res.village
-        formData.village_id = res.village_id
+        // formData.village = res.village
+        // formData.village_id = res.village_id
       })
     }
     const loadCityList = () => {
@@ -202,6 +204,7 @@ export default {
           const province = formData.address[0]
           const city = formData.address[1]
           const district = formData.address[2]
+          // const village = formData.address[3]
           // const country = formData.address[3]
           // const village = formData.address[3]
           let provinceId = ''
@@ -236,9 +239,9 @@ export default {
             provinceId = basicData.addressObject[0].id
             cityId = basicData.addressObject[1].id
             // console.log('city_id: ' + cityId)
-            if (!cityId) {
-              cityId = '1'
-            }
+            // if (!cityId) {
+            //   cityId = '1'
+            // }
 
             districtId = basicData.addressObject[2].id
             countryId = basicData.addressObject[3].id
@@ -248,9 +251,9 @@ export default {
             } else {
               formData.code_list = provinceId + ',' + cityId + ',' + districtId
             }
-            if (formData.address[4]) {
-              formData.viilage_id = basicData.addressObject[4].id
-              formData.village = basicData.addressObject[4].value
+            if (formData.address[3]) {
+              formData.village_id = basicData.addressObject[3].id
+              formData.village = basicData.addressObject[3].value
             }
           }
           addressNewCreate({
@@ -262,10 +265,10 @@ export default {
             real_name: formData.name,
             detail: formData.detail,
             code_list: formData.code_list,
-            city_id: cityId ? cityId : '1',
             // city_id: cityId,
-            village_id: formData.villageId,
-            village: formData.village,
+            city_id: '2',
+            // village_id: formData.village_id,
+            // village: formData.village,
             address_id: formData.address_id
             // address_id
           }).then(res => {

src/pages/user/address/index.vue

@@ -13,7 +13,7 @@
               >
                 默认
               </div>
-              <div class="flex text-sm text-gray-500">{{ item.province + ' ' + item.city + ' ' + item.district + ' ' + item.village}}</div>
+              <div class="flex text-sm text-gray-500">{{ item.province + ' ' + item.city + ' ' + item.district + ' ' + (item.town ? item.town : '')}}</div>
             </div>
             <div class="flex text-sm font-bold">{{ item.detail }}</div>
             <div class="flex gap-2 items-center text-xs text-gray-500">

src/pages/user/index.vue

@@ -82,7 +82,7 @@ const myServiceList = [{
   text: '商铺入驻',
   url: ''
 }, {
-  icon: CDN_URL + '/static/assets/bfzx3.png',
+  icon: '/static/icon/bangfu.png',
   text: '帮扶中心',
   url: '/pages/bangfuzhongxin/index'
 }, {

src/pages/vip/index.vue

@@ -3,7 +3,7 @@
 
     <div class="flex flex-col gap-3 ">
       <div
-          class="overflow-hidden fixed top-0 w-full"
+          class="overflow-hidden fixed top-0 w-full z-10"
       >
         <nut-searchbar
             v-model="state.keyword" @search="loadList('reload')" @clear="loadList('reload')">
@@ -19,7 +19,25 @@
           </template>
         </nut-searchbar>
       </div>
-      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>
+<!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
+
+      <div class="w-screen h-65">
+        <swiper
+            v-if="state.banners"
+            :indicator-dots="state.indicatorDots"
+            indicator-active-color="#e93323"
+            :autoplay="state.autoplay"
+            :circular="state.circular"
+            :interval="state.interval"
+            :duration="state.duration"
+            class="w-full h-full"
+        >
+          <swiper-item v-for="(item, index) in state.banners" :key="index">
+            <image :src="item.pic" class="!w-full !h-full" mode="aspectFill"/>
+          </swiper-item>
+        </swiper>
+      </div>
+
       <div class="flex px-3">
         会员专区
       </div>
@@ -99,6 +117,7 @@ import {computed} from "vue";
 import {getVipAreaList} from "~/apis/merchant";
 import {CDN_URL} from "~/config/app";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {getHomeBanner} from "~/apis/common";
 
 const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 
@@ -115,9 +134,16 @@ const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
+  banners: [],
 
   keyword: '' ,
   status: 'noMore',
+  indicatorDots: true,
+  circular: true,
+  autoplay: true,
+  interval: 5000,
+  duration: 500,
+  currents: "0",
 })
 const list = ref()
 
@@ -132,6 +158,10 @@ onLoad(() => {
   //     list.value = res.list
   //   }
   // })
+  getHomeBanner().then(res => {
+    console.log(res)
+    state.banners = res
+  })
   loadList('reload')
 })