v3.2.5

src/apis/auth.api.ts

@@ -1,5 +1,5 @@
 import {defHttp} from "~/utils/http";
-import type {LoginModel} from "~/apis/model/login.model";
+import type {AccountModel, LoginModel} from "~/apis/model/login.model";
 
 enum API {
     // 短信验证码
@@ -61,4 +61,21 @@ export function authSmsLogin(params: {
             ...params
         }
     })
+}
+
+/**
+ * 绑定提现账户
+ * 
+ */
+
+export function Accountbind(params: {
+    openid: string,
+    wx_type: string,
+}): Promise<AccountModel> {
+    return defHttp.post({
+        url: API.USER_EXTRACT_BAND_OPENID,
+        data: {
+            ...params
+        }
+    })
 }

src/apis/model/login.model.ts

@@ -6,6 +6,11 @@ export interface LoginModel {
     // 用户信息
     user: LoginUserModel
 }
+export interface AccountModel {
+    
+    openid: string
+    wx_type: string
+}
 
 export interface LoginUserModel {
     uid: string//用户id

src/apis/model/shopping.model.ts

@@ -1,5 +1,5 @@
 export interface ShoppingResult {
-    list: Array<ShopModel>
+    list?: Array<ShopModel>
 }
 
 export interface ShopModel {

src/apis/order.api.ts

@@ -280,7 +280,7 @@ export function getIntegralOrderCreate(params: CreateOrderRequest): Promise<Inte
  */
 export function getOrderListFromStatus(params: {
     page: number
-    //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付
+    //   订单状态（0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付 6已取消
     status: number
     limit: number
 }): Promise<OrderListResult> {

src/apis/product.ts

@@ -53,7 +53,7 @@ enum API {
     // 拼多多商品列表
     PDD_LIST = '/api/pdd/list',
     // 拼多多商品搜索
-    PDD_SEARCH = '/api/pdd/search',
+    PDD_SEARCH = '/api/pdd/list',
     // 拼多多商品详情
     PDD_DETAIL = '/api/pdd/detail',
 

src/apis/user.ts

@@ -1,35 +1,35 @@
-import {defHttp} from '~/utils/http'
-import type {UserUnionParams, UserUnionResult} from "~/apis/model/userUnionModel";
+import { defHttp } from '~/utils/http'
+import type { UserUnionParams, UserUnionResult } from "~/apis/model/userUnionModel";
 import Cache from '~/utils/cache'
-import {EXPIRES_TIME, LOGIN_STATUS, STATE_R_KEY, USER_INFO} from "~/constants";
-import {useUserStore} from "~/stores/userStore";
-import type {YanglaoStatisticsResult} from "~/apis/model/yanglaoStatisticsModel";
-import type {UpdateUserInfoRequestModel, UserInfoModel} from "~/apis/model/userInfoModel";
-import type {InvitePartnerModel, UserInviteParams} from "~/apis/model/invitePartnerModel";
-import type {UserShareProductListModel, UserShareProductParams} from "~/apis/model/userShareProductModel";
-import type {RevenueSharingModel, RevenueSharingParams} from "~/apis/model/revenueSharingModel";
-import type {AccumulateIncomeModel, UserInviteProfitParams} from "~/apis/model/accumulateIncomeModel";
-import type {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
-import type {WithdrawalParams, WithdrawalServiceModel} from "~/apis/model/withdrawalService";
-import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
-import type {WithdrawalModel} from "~/apis/model/withdrawalModel";
-import type {MyRelationMerchantParams, MyRelationMerchantResult} from "~/apis/model/myRelationMerchantModel";
-import type {MyRelationProductPrams, MyRelationProductResult} from "~/apis/model/myRelationProductModel";
-import type {IntegralParams, IntegralResult} from "~/apis/model/integralModel";
+import { EXPIRES_TIME, LOGIN_STATUS, OPEN_ID, STATE_R_KEY, USER_INFO } from "~/constants";
+import { useUserStore } from "~/stores/userStore";
+import type { YanglaoStatisticsResult } from "~/apis/model/yanglaoStatisticsModel";
+import type { UpdateUserInfoRequestModel, UserInfoModel } from "~/apis/model/userInfoModel";
+import type { InvitePartnerModel, UserInviteParams } from "~/apis/model/invitePartnerModel";
+import type { UserShareProductListModel, UserShareProductParams } from "~/apis/model/userShareProductModel";
+import type { RevenueSharingModel, RevenueSharingParams } from "~/apis/model/revenueSharingModel";
+import type { AccumulateIncomeModel, UserInviteProfitParams } from "~/apis/model/accumulateIncomeModel";
+import type { SpreadInfoModel } from "~/apis/model/spreadInfoModel";
+import type { WithdrawalParams, WithdrawalServiceModel } from "~/apis/model/withdrawalService";
+import type { UserYanglaoJinModel } from "~/apis/model/userYanglaoJinModel";
+import type { WithdrawalModel } from "~/apis/model/withdrawalModel";
+import type { MyRelationMerchantParams, MyRelationMerchantResult } from "~/apis/model/myRelationMerchantModel";
+import type { MyRelationProductPrams, MyRelationProductResult } from "~/apis/model/myRelationProductModel";
+import type { IntegralParams, IntegralResult } from "~/apis/model/integralModel";
 import type {
     SharePosterClassifyResult,
     SharePosterImageResult,
     SharePostersImagesListParams,
 } from "~/apis/model/inviteFriendsModel";
-import type {ReplyParams, ReplyResult} from "~/apis/model/replyModel";
-import type {SignInInfoModel, SignInModel} from "~/apis/model/signIninfo.model";
-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";
-import type {YanglaoLogXsResult, YanglaoLogXxResult} from "~/apis/model/yanglao-log.model";
-import type {InvitePHPModel} from "~/apis/model/invite.model";
+import type { ReplyParams, ReplyResult } from "~/apis/model/replyModel";
+import type { SignInInfoModel, SignInModel } from "~/apis/model/signIninfo.model";
+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";
+import type { YanglaoLogXsResult, YanglaoLogXxResult } from "~/apis/model/yanglao-log.model";
+import type { InvitePHPModel } from "~/apis/model/invite.model";
 
 // 会员中心的提现
 // export function entropy(data) {
@@ -187,7 +187,7 @@ export function xcxBanding(params: { mer_id: string, share_id: string }) {
  * 生成用户图片
  * @param params
  */
-export function getGenerateImage(params: {uid: string, img_id: string}) {
+export function getGenerateImage(params: { uid: string, img_id: string }) {
     return defHttp.post({
         url: API.POSTER_SERVICE_IMAGES,
         data: {

src/components/CXBPhoneLoginButton/CXBPhoneLoginButton.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import {authAppletPhone, bindPhone, getUserUnionId} from "~/apis/user";
-import {useUserStore} from "~/stores/userStore";
+import { authAppletPhone, bindPhone, getUserUnionId } from "~/apis/user";
+import { useUserStore } from "~/stores/userStore";
 import Cache from "~/utils/cache";
 const userStore = useUserStore()
 const props = defineProps({
@@ -24,6 +24,10 @@ function getPhoneNumber(e) {
           code: result.code,
           source,
         }).then(unionRes => {
+          console.log(111111, unionRes)
+          // const shareId = Cache.get('SHARE_ID')
+          //存储openid
+          // userStore.setOpenid(unionRes.openid)
           // getShareId(shareI)
           const shareId = Cache.get('SHARE_ID')
 
@@ -36,7 +40,7 @@ function getPhoneNumber(e) {
             params.share_id = shareId
           }
 
-          let redirectPageObj: {page: string, type: 'page' | 'tab'}
+          let redirectPageObj: { page: string, type: 'page' | 'tab' }
           if (Cache.get('SHARE_REDIRECT_PAGE')) {
             redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
           }
@@ -125,21 +129,18 @@ function getPhoneNumber(e) {
 }
 </script>
 <template>
-  <div class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center">
-    <image
-        src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
-        class="w-4 h-4"
-    ></image>
-    <button
-        open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
-    >
+  <div
+    class="bg-white border border-solid border-1 border-gray-300 rounded-md py-3 gap-2 flex justify-center items-center">
+    <image src="https://test.bjtdba.com/applet/static/home/4879edf0b6e2b0ad29fa7d4053d676b.png" mode="widthFix"
+      class="w-4 h-4"></image>
+    <button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
       {{ text }}
     </button>
   </div>
 </template>
 
 <style>
-button{
+button {
   margin: 0;
   padding: 0;
   outline: none;
@@ -147,7 +148,8 @@ button{
   background-color: transparent;
   line-height: inherit;
 }
-button::after{
+
+button::after {
   border: none;
 }
 </style>

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -87,6 +87,8 @@ onMounted(() => {
 })
 
 function handleSelectedSku(skuItem: any) {
+  console.log(skuItem);
+
   currentSku.value = skuItem
   console.log('我是数据', currentSku.value);
 
@@ -107,6 +109,9 @@ function handleBuyNow() {
 function handleJiaCart() {
   emit('subAdd')
 }
+function handleSubQg() {
+  emit('subQg')
+}
 
 function handleCountChange(value) {
   emit('count-change', value)
@@ -187,6 +192,18 @@ function handleCountChange(value) {
         </FButton>
 
       </div>
+      <div class="px-3 pb-10" v-if="isTo == 4">
+        <FButton @click="handleSubQg" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即抢购
+        </FButton>
+
+      </div>
+      <div class="px-3 pb-10" v-if="isTo == 5">
+        <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
+          立即抢购
+        </FButton>
+
+      </div>
       <div class="px-3 pb-10" v-if="isTo == 3">
         <FButton @click="handleAddCart" size="small" :exClass="['!bg-primary', 'rounded-full', 'text-white']" block>
           立即兑换

src/components/FButton/FButton.vue

@@ -6,7 +6,7 @@ const props = defineProps(buttonProps)
 const emit = defineEmits(buttonEmits)
 
 const { disabled, clickHandler } = useButton(props, emit)
-console.log(props);
+
 
 </script>
 

src/constants/index.ts

@@ -9,6 +9,9 @@ export const  LOGIN_STATUS = 'LOGIN_STATUS_TOKEN'
     // uid
 export const UID = 'UID'
 export const USER_INFO = 'USER_INFO'
+export const  OPEN_ID= 'OPEN_ID'
+export const SHARE_REDIRECT_PAGE = 'SHARE_REDIRECT_PAGE'
+
     //token 过期时间
 export const  EXPIRES_TIME = 'EXPIRES_TIME'
     //�Ƿ���Ȩ

src/pages/after-sales-order-list/index.vue

@@ -116,6 +116,8 @@ function loadAllOrderList() {
   })
 }
 watch(() => state.tabvalue, (val) => {
+  console.log('我是val',val);
+  
   switch (val) {
     case '0': {
       loadAllOrderList()

src/pages/annuity/index.vue

@@ -1,9 +1,18 @@
 <script setup lang="ts">
-import {getAmountFromGzc, getYanglaojinStatistics} from "~/apis/user";
-import {CDN_URL} from "~/config/app";
+import { getAmountFromGzc, getYanglaojinStatistics, getUserYangLaoJin } from "~/apis/user";
+import { CDN_URL, CDM_URL } from "~/config/app";
+import dayjs from "dayjs";
+
 const get_to_know_buttons_220713Image = CDN_URL + '/static/assets/get_to_know_buttons_220713.png'
 const ylj_fh_220914Image = CDN_URL + '/static/assets/ylj_fh_220914.png'
 
+
+const annuity_yuan_220713Image = CDN_URL + '/static/assets/annuity_yuan_220713.png'
+const agreement_checkedImage = CDN_URL + '/static/assets/agreement_checked.png'
+const yrzImg = CDM_URL + '/image/2023-12-04/20231204124659874.png'
+const smrzImg = CDM_URL + '/image/2023-12-04/20231204124635512.png'
+
+
 const userStore = useUserStore()
 const progress = [{
   type: 'item',
@@ -18,24 +27,24 @@ const progress = [{
   title: '绑定微信支付宝',
   icon: CDN_URL + '/static/assets/ylj_bd_220914.png'
 },
-  {
-    type: 'separator',
-    icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
-  }, {
-    type: 'item',
-
-    title: '平台结算',
-    icon: CDN_URL + '/static/assets/ylj_js_220914.png'
-  },
-  {
-    type: 'separator',
-    icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
-  }, {
-    type: 'item',
-
-    title: '计入账号开通',
-    icon: CDN_URL + '/static/assets/ylj_kt_220914.png'
-  }]
+{
+  type: 'separator',
+  icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
+}, {
+  type: 'item',
+
+  title: '平台结算',
+  icon: CDN_URL + '/static/assets/ylj_js_220914.png'
+},
+{
+  type: 'separator',
+  icon: CDN_URL + '/static/assets/ylj_fh_220914.png'
+}, {
+  type: 'item',
+
+  title: '计入账号开通',
+  icon: CDN_URL + '/static/assets/ylj_kt_220914.png'
+}]
 
 const state = reactive({
   all_yanglao: 0,
@@ -44,11 +53,13 @@ const state = reactive({
     amount: 0
   }
 })
+const userYangLaoJin = ref({})
 
 const yanglaoStatistics = ref()
 onLoad(() => {
   getYanglaojinStatistics().then(res => {
     // state.all_yanglao = res.all_yanglao
+
     yanglaoStatistics.value = res
   }).catch(error => {
     if (error === '未登录') {
@@ -61,7 +72,45 @@ onLoad(() => {
   getAmountFromGzc().then(res => {
     state.amountFromGzc = res
   })
+  //养老金账户
+  console.log('页面显示了');
+  getUserYangLaoJin().then(res => {
+    console.log('养老保险', res);
+
+    if (res.birthday60 === "未实名认证") {
+      console.log('触发条件');
+
+      setTimeout(() => {
+        uni.showModal({
+          title: '温馨提示',
+          content: '实名认证后才可查看获得的养老金哦~',
+          cancelText: "取消", // 取消按钮的文字
+          confirmText: "去认证", // 确认按钮的文字
+          showCancel: true, // 是否显示取消按钮，默认为 true
+          confirmColor: '#f55850',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('comfirm') //点击确定之后执行的代码
+              setTimeout(() => {
+                uni.navigateTo({
+                  url: '/pages/real-name-authentication/index'
+                })
+              }, 300);
+            } else {
+              console.log('cancel') //点击取消之后执行的代码
+            }
+          }
+        })
+      }, 300);
+    }
+    userYangLaoJin.value = res;
+  })
 })
+
+onShow(() => {
+
+})
+
 function handleThirdBind() {
   uni.navigateTo({
     url: '/pages/third_party_binding/index'
@@ -106,6 +155,22 @@ function handleShowAgreement(type) {
     url: '/pages/webview/agreement?type=' + type
   })
 }
+
+//展示图片
+const ImgType = computed(() => {
+  if (userStore.userInfo?.is_ertification) {
+    const img = userStore.userInfo.is_ertification
+    if (img == 1) {
+      return yrzImg
+    } else {
+      return smrzImg
+    }
+
+  }
+
+})
+
+
 </script>
 
 <template>
@@ -118,48 +183,37 @@ function handleShowAgreement(type) {
       </div>
       <div class="flex flex-col bg-white rounded  p-4">
         <div class="flex items-center w-full gap-2">
-          <image v-if="userStore.userInfo && userStore.userInfo.avatar"
-                 :src="userStore.userInfo.avatar"
-                 mode="widthFix"
-                 class="w-9 h-9 rounded-full"
-          />
-          <image
-              v-else
-              src="https://app.bjtdba.com/uploads/logo.jpg"
-              mode="widthFix"
-              class="w-9 h-9 rounded-full"
-          />
+          <image v-if="userStore.userInfo && userStore.userInfo.avatar" :src="userStore.userInfo.avatar" mode="widthFix"
+            class="w-9 h-9 rounded-full" />
+          <image v-else src="https://app.bjtdba.com/uploads/logo.jpg" mode="widthFix" class="w-9 h-9 rounded-full" />
           <div>
             {{ userStore.userInfo.nickname }}
           </div>
-          <div
-              @tap="handleRealName"
-              class="text-xs underline text-[#fe0032]"
-          >
-            {{userStore.userInfo.is_ertification == 1 ? '已认证' : '实名认证'}}
-
+          <div @tap="handleRealName" class="box_img">
+            <!-- {{ userStore.userInfo.is_ertification == 1 ? '已认证' : '实名认证' }} -->
+            <image lazy-load :src="ImgType" class="w-full h-full"></image>
           </div>
         </div>
         <div class="flex-1 flex flex-col justify-between items-center py-4 gap-4">
           <div class="flex flex-col justify-center items-center">
             <div class="text-xs">总养老金</div>
-            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{yanglaoStatistics.all_yanglao}}</div>
+            <div class="text-[#F94032] font-bold text-[28px]" v-if="yanglaoStatistics">￥{{ yanglaoStatistics.all_yanglao
+            }}
+            </div>
           </div>
           <div class=" flex justify-around w-full">
             <div class="flex flex-col justify-center items-center " v-if="yanglaoStatistics">
               <div class="font-bold">
-                ￥ {{(yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2)}}
+                ￥ {{ (yanglaoStatistics.all_yanglao - yanglaoStatistics.all_yanglao_a).toFixed(2) }}
               </div>
               <div class="text-xs text-gray-400">预估养老金</div>
             </div>
 
             <div class="flex flex-col justify-center items-center pl-3" v-if="yanglaoStatistics">
-              <div>￥ {{yanglaoStatistics.all_yanglao_a}}</div>
+              <div>￥ {{ (yanglaoStatistics.all_yanglao_a).toFixed(2) }}</div>
               <div class="text-xs text-gray-400">已结算</div>
             </div>
-            <div
-                @tap="handleToCitic"
-                class="flex flex-col justify-center items-center pl-3">
+            <div @tap="handleToCitic" class="flex flex-col justify-center items-center pl-3">
               <div>￥{{ state.amountFromGzc.amount }}</div>
               <div class="text-xs text-gray-400">中信公证处</div>
             </div>
@@ -173,47 +227,73 @@ function handleShowAgreement(type) {
         <div>养老金账号开通流程</div>
         <div class="flex flex-row justify-center items-center w-full h-full">
           <div v-for="(item, index) in progress" :key="index" class="flex flex-1 justify-center">
-            <div
-                v-if="item.type === 'item'"
-                class="flex flex-col justify-between items-center w-12 text-center ">
+            <div v-if="item.type === 'item'" class="flex flex-col justify-between items-center w-12 text-center ">
               <image :src="item.icon" mode="widthFix" class="w-10 h-10"></image>
               <div class="text-xs h-8 flex flex-col justify-center items-center">{{ item.title }}</div>
             </div>
-            <div
-                v-if="item.type === 'separator'"
-                class="flex flex-col justify-start items-start h-10"
-            >
-              <image
-                  :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
+            <div v-if="item.type === 'separator'" class="flex flex-col justify-start items-start h-10">
+              <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
             </div>
 
           </div>
 
         </div>
       </div>
+      <!-- 养老金账户 -->
+      <div class="flex flex-col bg-white rounded p-4 text-sm gap-3">
+        <div>养老金账号余额提取</div>
+
+        <div class="relative">
+          <div class="absolute top-0 left-0 mt-2 w-full  ">
+            <div class="px-9">
+              <div class="py-px bg-red"></div>
+            </div>
+          </div>
+          <div class="relative flex items-center justify-between">
+            <div class="text-center">
+              <div class="inline-block  rounded-full bg-white">
+                <image :src="annuity_yuan_220713Image" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="block mt-3">
+                <div>加入时间</div>
+                <div class="text-gray">
+                  {{ userYangLaoJin.create_time && dayjs(userYangLaoJin.create_time).format('YYYY-MM-DD') }}
+                </div>
+              </div>
+            </div>
+            <div class="text-center">
+              <div class="inline-block rounded-full bg-white">
+                <image :src="agreement_checkedImage" mode="widthFix" class="w-4 h-4"></image>
+              </div>
+              <div class="block mt-3">
+                <div>法定提取时间</div>
+                <div class="text-gray">
+                  {{ userYangLaoJin.birthday60 }}
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      </div>
 
       <div class="flex flex-col bg-white rounded text-sm px-3">
-        <div
-            @tap="handleThirdBind"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        <!-- <div @tap="handleThirdBind"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>支付平台绑定</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
-        </div>
-        <div
-            @tap="handlePensionAccount"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        </div> -->
+        <!-- <div @tap="handlePensionAccount"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>养老金账户</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
-        </div>
-        <div
-            @tap="handlePensionRecord"
-            class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
+        </div> -->
+        <div @tap="handlePensionRecord"
+          class="flex justify-between items-center border border-solid border-1 border-gray-100 border-x-0 border-t-0 !border-b py-3">
           <div>养老金记录</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
         </div>
-        <div
-            @tap="handleToCitic"
-            class="flex justify-between items-center py-3">
+        <div @tap="handleToCitic" class="flex justify-between items-center py-3">
           <div>中信公证处查看</div>
           <image :src="ylj_fh_220914Image" mode="widthFix" class="w-2 h-2"></image>
         </div>
@@ -234,6 +314,11 @@ function handleShowAgreement(type) {
 page {
   background: #f8f8f8;
 }
+
+.box_img {
+  width: 144rpx;
+  height: 50rpx;
+}
 </style>
 <route lang="yaml">
 style:

src/pages/article/detail.vue

@@ -7,7 +7,7 @@ const article: Ref<ArticleModel | undefined> = ref<ArticleModel>()
 onLoad((option: any) => {
   if (option.article_id) {
     getArticleDetail(option.article_id).then(res => {
-      console.log(res)
+      console.log('~~~~~~~~',res)
       uni.setNavigationBarTitle({
         title: res.title
       })

src/pages/dacang/list/components/dacang-header.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
-import {computed, PropType} from "vue";
+import { computed, PropType } from "vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
-import {useUserStore} from "~/stores/userStore";
-import {useDacangStore} from "~/stores/dacangStore";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
+import { useUserStore } from "~/stores/userStore";
+import { useDacangStore } from "~/stores/dacangStore";
 // import {useUserStore} from "~/stores/userStore";
 const userStore = useUserStore()
 const dacangStore = useDacangStore()
@@ -74,7 +74,7 @@ function handleClick() {
 //
 // }
 const emit = defineEmits<{
-  (e: 'click:item', value:string): void
+  (e: 'click:item', value: string): void
 }>()
 function handleTabItemClick(currentTab) {
   emit('click:item', tabValue.value)
@@ -86,19 +86,15 @@ function handleShowSearchPage() {
 }
 </script>
 <template>
-  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20"
-       :style="navBarStyle"
-       :class="exClass"
-  >
+  <div class="dacang-header fixed w-screen text-white z-10 w-full h-20" :style="navBarStyle" :class="exClass">
     <div class="pl-2 pt-2">
-      <div class="w-60% bg-white rounded-full flex flex-row justify-between items-center border-solid border-1 border-red">
+      <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>
+        <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%" @tap.stop="handleShowSearchPage">
-          <div class="flex-1 pl-2 text-gray">搜索商品关键词</div>
+          <div class="flex-1 pl-2  font_size ">搜索商品关键词</div>
           <div class="bg-[#D71608] text-white text-xs w-11 rounded-full text-center py-1 my-0.5 mr-0.5 ">
             搜索
           </div>
@@ -109,19 +105,17 @@ function handleShowSearchPage() {
 
     </div>
 
-<!--    <div class="p-3">-->
-      <div class=" ">
-       <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
-<!--         <nut-tab-panel :title="全部"></nut-tab-panel>-->
-          <nut-tab-pane v-for="item in tabs" :title="item.cate_name"
-                        :pane-key="item.store_category_id"
-                        :key="item.store_category_id"
-          >
-          </nut-tab-pane>
-       </nut-tabs>
+    <!--    <div class="p-3">-->
+    <div class=" ">
+      <nut-tabs v-model="tabValue" title-scroll title-gutter="10" name="catePanel" @change="handleTabItemClick">
+        <!--         <nut-tab-panel :title="全部"></nut-tab-panel>-->
+        <nut-tab-pane v-for="item in tabs" :title="item.cate_name" :pane-key="item.store_category_id"
+          :key="item.store_category_id">
+        </nut-tab-pane>
+      </nut-tabs>
 
-      </div>
-<!--    </div>-->
+    </div>
+    <!--    </div>-->
 
   </div>
 </template>
@@ -132,4 +126,11 @@ function handleShowSearchPage() {
   --nut-tabs-titles-item-color: #fff;
   --nut-tabs-titles-item-active-color: #fff;
 }
+
+
+.font_size {
+  font-size: 24rpx;
+  line-height: 42rpx;
+  color: #c0c5cc;
+}
 </style>

src/pages/dacang/list/index.vue

@@ -19,12 +19,13 @@ const usePageStore = usePageStoreWidthOut()
 
 
 const state = reactive({
-  tabs: [{ store_category_id: '-1', cate_name: '全部' }],
+  tabs: [],
+  lists: {},
   productList: <Array<DcProductModel>>[],
-  currentClassify: '',
+  currentClassify: '-1',
   keyword: '',
   status: 'noMore',
-  banner:'',
+  banner: '',
   currentPage: 1,
   pageSize: 10,
   totalPage: 1
@@ -33,6 +34,7 @@ const state = reactive({
 // 距离顶部距离
 let Scroll_X = ref(0)
 
+let scrollPositions = reactive({})
 const dacangStore = useDacangStore()
 const userStore = useUserStore()
 
@@ -40,7 +42,6 @@ const userStore = useUserStore()
 onLoad(async (option) => {
   state.tabs = [{ store_category_id: '-1', cate_name: '全部' }]
   const classifyRes = await getDcProductClassify()
-
   state.tabs.push(...classifyRes)
   usePageStore.setPageConfig({
     currentPage: {
@@ -60,11 +61,11 @@ onLoad(async (option) => {
     console.log(message)
   })
   userStore.setRedirectPage(`/pages/dacang/list/index`, 'tab')
-  getBannerImg().then(res=>{
-    console.log('banner',res);
-    state.banner=res[0].pic
+  getBannerImg().then(res => {
+    console.log('banner', res);
+    state.banner = res[0].pic
     console.log(state.banner);
-    
+
   })
 
 })
@@ -89,7 +90,8 @@ onShareTimeline(() => {
   }
 })
 
-onShow(async (options) => {
+onShow((options) => {
+
   usePageStore.setPageConfig({
     currentPage: {
       type: 'tab',
@@ -99,7 +101,7 @@ onShow(async (options) => {
   loadList('reload')
 })
 
-function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+const loadList = async (action: 'page' | 'reload', callback?: (items) => void) => {
   console.log(action);
   let params: any = {
     page: state.currentPage,
@@ -107,41 +109,79 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     keyword: state.keyword
   }
   console.log(params);
-  if (dacangStore.currentClassify !== '-1') {
-    params.classify = dacangStore.currentClassify
+  if (state.currentClassify !== '-1') {
+    params.classify = state.currentClassify
+  }
+  let res = await getDcProductList({
+    ...params
+  })
+  console.log('res>>>>', res);
+  if (action === 'page') {
+    state.lists[state.currentClassify] = state.lists[state.currentClassify].concat(res)
+  }
+  if (action === 'reload') {
+    state.lists[state.currentClassify] = res
   }
 
+  if (callback) {
+    callback(res)
+  }
 
 
-  getDcProductList({
-    ...params
-  }).then(res => {
-    if (action === 'page') {
-      state.productList = state.productList.concat(res)
-    }
-    if (action === 'reload') {
-      state.productList = res
-    }
-
-    if (callback) {
-      callback(res)
-    }
-  })
 }
 
-function handleTabItemClick(classifyId) {
+function handleTabItemClick(classifyId: string) {
   state.currentClassify = classifyId
-  dacangStore.setClassify(classifyId)
+  // uni.pageScrollTo({
+  //   scrollTop: 0
+  // });
+  state.currentPage = 1
+  state.pageSize = 10
+
   setTimeout(() => {
     loadList('reload')
   }, 300)
-  // }
+
 }
 
+// function handleTabItemClick(classifyId) {
+//   // 保存当前分类页的滚动位置
+//   scrollPositions[state.currentClassify] = Scroll_X.value;
+
+//   console.log(111, scrollPositions[classifyId]);
+
+//   // 切换当前分类页
+//   state.currentClassify = classifyId;
+
+//   // 检查当前分类页是否有保存的滚动位置
+//   if (scrollPositions[classifyId] !== undefined) {
+//     // 如果有保存的滚动位置，恢复滚动位置
+//     uni.pageScrollTo({
+//       scrollTop: scrollPositions[classifyId],
+//     });
+//   } else {
+//     // 如果没有保存的滚动位置，重新加载数据
+//     state.currentPage = 1;
+//     state.pageSize = 10;
+//     loadList('reload');
+//   }
+// }
+
+function toHuiyuan() {
+  
+  uni.navigateTo({
+    url: `/pages/guest_member_new/index?is_merchant=${userStore.userInfo.is_merchant}`
+  })
+}
+
+
 const headerClass = ref('')
 
 onPageScroll((page) => {
+
+
   Scroll_X.value = Number(page.scrollTop.toFixed())
+
   // page.scrollTop
   if (page.scrollTop >= 76) {
     headerClass.value = '!bg-primary !text-white'
@@ -165,11 +205,13 @@ onReachBottom(() => {
   })
 })
 onPullDownRefresh(() => {
-  uni.showLoading()
-  loadList('reload', (items) => {
-    uni.hideLoading()
-    uni.stopPullDownRefresh()
-  })
+  // uni.showLoading()
+  // state.currentPage = 1
+  // state.pageSize = 10
+  // loadList('reload', (items) => {
+  //   uni.hideLoading()
+  //   uni.stopPullDownRefresh()
+  // })
 })
 
 
@@ -180,9 +222,12 @@ onPullDownRefresh(() => {
 
     <div class="flex flex-col gap-2 ">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-      <image lazy-load :src="state.banner" mode="widthFix" class="w-full h-50"></image>
-      <ProductList :list="state.productList" />
-      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500" v-if="state.productList.length > 0">
+      <image lazy-load :src="state.banner" mode="widthFix" @click="toHuiyuan" class="w-full h-50"></image>
+      <div>
+        <ProductList :list="state.lists[state.currentClassify]" />
+      </div>
+      <div class="pb-safe flex justify-center items-center text-[12px] text-gray-500"
+        v-if="state.lists[state.currentClassify]?.length > 0">
         <div v-if="state.status === 'loading'">
           加载中...
         </div>

src/pages/home/components/navs.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import {getHomeQuickLink} from "~/apis/common";
-import {PLATFORM_NAME} from "~/apis/model/common.model";
-import {useDacangStore} from "~/stores/dacangStore";
-import {CDN_URL,CDM_URL} from "~/config/app";
+import { getHomeQuickLink } from "~/apis/common";
+import { PLATFORM_NAME } from "~/apis/model/common.model";
+import { useDacangStore } from "~/stores/dacangStore";
+import { CDN_URL, CDM_URL } from "~/config/app";
 
 const navList = ref([{
   image: CDM_URL + '/image/2023-11-20/20231120155257975.png',
@@ -12,29 +12,34 @@ const navList = ref([{
   image: CDN_URL + '/static/home-nav/home_xianshimiaosha_220614.png',
   title: '限时秒杀',
   key: 'miaosha'
-}, {
-  image: CDN_URL + '/static/home-nav/jingdongshengqian_220920.png',
-  title: '京东',
-  key: PLATFORM_NAME.JD
-}, {
+},{
+  image: CDM_URL + '/image/2023-11-30/20231130092625318.png',
+  title: '会员专区',
+  key: 'user',
+},{
   image: '',
   title: '鼎盛联盟',
   key: 'dingsheng',
-  // categoryId: '430'
-  // 测试库
+  // https://cdn.bjtdba.com/vod/image/2023-11-30/20231130092553801.png  gc
+  // https://cdn.bjtdba.com/vod/image/2023-11-30/20231130092625318.png  会员
   // categoryId: '149'
 },{
-  image: CDM_URL + '/image/2023-11-24/20231124150424710.png',
-  title: '拼多多',
-  key: PLATFORM_NAME.PDD
+  image: CDN_URL + '/static/home-nav/icon_hmyh_221014.png',
+  title: '惠民专区',
+  key: PLATFORM_NAME.DC,
+  categoryId: '567',
+},{
+  image: CDN_URL + '/static/home-nav/jingdongshengqian_220920.png',
+  title: '京东',
+  key: PLATFORM_NAME.JD
 }, {
   image: CDN_URL + '/static/home-nav/home_taobaoyanglao_220920.png',
   title: '淘宝',
   key: PLATFORM_NAME.TB
 }, {
-  image: CDN_URL + '/static/home-nav/douyin_logo_230317.png',
-  title: '抖音',
-  key: PLATFORM_NAME.DY
+  image: CDM_URL + '/image/2023-11-24/20231124150424710.png',
+  title: '拼多多',
+  key: PLATFORM_NAME.PDD
 }, {
   image: CDN_URL + '/static/home-nav/home_weipinhui_220920.png',
   title: '唯品会',
@@ -43,43 +48,25 @@ const navList = ref([{
   image: CDN_URL + '/static/home-nav/home_suningyigou_220920.png',
   title: '苏宁易购',
   key: PLATFORM_NAME.SU
+},{
+  image: CDN_URL + '/static/home-nav/douyin_logo_230317.png',
+  title: '抖音',
+  key: PLATFORM_NAME.DY
 }, {
-  image: CDN_URL + '/static/home-nav/home_jinfentongdui_220615.png',
-  title: '积分通兑',
-  key: 'integral'
-}, {
-  image: CDN_URL + '/static/home-nav/elderly_zone_220920.png',
-  title: '老年专区',
-  key: PLATFORM_NAME.DC,
+  image: CDM_URL + '/image/2023-11-30/20231130092553801.png',
+  title: '工厂直供',
+  key: 'gongchang',
   categoryId: '571'
-}, 
- {
+},
+{
   image: '',
-  title: '滋补保健',
+  title: '滋补养生',
   key: 'zibu',
   categoryId: '430'
-  // 测试库
-  // categoryId: '149'
-},
-
-// {
-//   image: CDN_URL + '/static/home-nav/the_student_zone_220920.png',
-//   title: '学生专区',
-//   key: PLATFORM_NAME.DC,
-//   categoryId: '576'
-// }, 
-{
-  image: CDM_URL + '/image/2023-11-20/20231120155340358.png',
-  title: '会员专区',
-  key: 'member',
-  // key: PLATFORM_NAME.DC,
-  // categoryId: '567',
 }, {
-  image: CDN_URL + '/static/home-nav/icon_hmyh_221014.png',
-  title: '惠民专区',
-  key: PLATFORM_NAME.DC,
-  categoryId: '567',
-
+  image: CDN_URL + '/static/home-nav/home_jinfentongdui_220615.png',
+  title: '积分通兑',
+  key: 'integral'
 }, {
   image: CDN_URL + '/static/home-nav/home_gengduo.png',
   title: '更多',
@@ -88,10 +75,12 @@ const navList = ref([{
 
 onBeforeMount(() => {
   getHomeQuickLink().then(res => {
+    console.log('res>>>>>', res);
+
     if (res) {
-		navList.value[11] = res[0]
-		navList.value[3] = res[1]
-		// navList.value[3] = res[0]
+      navList.value[12] = res[0]
+      navList.value[3] = res[1]
+      // navList.value[3] = res[0]
       // console.log(res)
     }
   })
@@ -108,15 +97,12 @@ function handleItemClick(item: any) {
       uni.switchTab({
         url: '/pages/dacang/list/index'
       })
-      // uni.navigateTo({
-      //   url: '/pagesC/goods_details/index?id=4858'
-      // })
       break;
     }
     // 会员专区
-    case 'member': {
+    case 'user': {
       uni.navigateTo({
-        url: '/pages/vip/index'
+        url: `/pages/vip/index?type=`+item.key
       })
       break;
     }
@@ -135,18 +121,25 @@ function handleItemClick(item: any) {
       })
       break;
     }
-	case 'dingsheng': {
-	  uni.navigateTo({
-	    url: `/pages/product/dingshenglianmeng?type=`+item.key
-	  })
-	  break;
-	}
-	case 'jingpin': {
-	  uni.navigateTo({
-	    url: `/pages/product/dingshenglianmeng?type=`+item.key
-	  })
-	  break;
-	}
+    case 'dingsheng': {
+      uni.navigateTo({
+        url: `/pages/product/dingshenglianmeng?type=` + item.key
+      })
+      break;
+    }
+    //工厂直供
+    case 'gongchang': {
+      uni.navigateTo({
+        url: `/pages/vip/index?type=`+item.key
+      })
+      break;
+    }
+    case 'jingpin': {
+      uni.navigateTo({
+        url: `/pages/product/dingshenglianmeng?type=` + item.key
+      })
+      break;
+    }
     // 积分通兑
     case 'integral': {
       uni.navigateTo({
@@ -178,16 +171,11 @@ function handleItemClick(item: any) {
   <div class="">
     <div class="rounded bg-white pt-4 pb-2 px-5">
       <div class="flex justify-around flex-wrap ">
-        <div
-            @tap="handleItemClick(navItem)"
-            class="flex flex-col items-center justify-center gap-y-1 mb-2 flex-[0_0_20%]"
-             v-for="(navItem, index) in navList" :key="index">
-          <image :src="navItem.image"
-                 mode="widthFix"
-                 class="w-10 h-10"
-          ></image>
+        <div @tap="handleItemClick(navItem)" class="flex flex-col items-center justify-center gap-y-1 mb-2 flex-[0_0_20%]"
+          v-for="(navItem, index) in navList" :key="index">
+          <image :src="navItem.image" mode="widthFix" class="w-10 h-10"></image>
           <div class="text-xs">
-            {{navItem.title}}
+            {{ navItem.title }}
           </div>
         </div>
       </div>

src/pages/home/index.vue

@@ -208,7 +208,7 @@ const homeBanner = CDN_URL + '/static/assets/home-banner.png'
 function handleBannerClick(item) {
   if(item.url == 'rich') {
     uni.navigateTo({
-      url: '/pages/vip/index'
+      url: '/pages/vip/index?type=user'
     })
   }
 }

src/pages/immediate-withdrawal/index.vue

@@ -7,16 +7,18 @@ import {
   getWithdrawalConfig,
   getWithdrawalService
 } from "~/apis/user";
-import {SpreadInfoModel} from "~/apis/model/spreadInfoModel";
-import type {UserYanglaoJinModel} from "~/apis/model/userYanglaoJinModel";
-import {CDN_URL} from "~/config/app";
-import {isNumber} from "~/utils";
+import { SpreadInfoModel } from "~/apis/model/spreadInfoModel";
+import type { UserYanglaoJinModel } from "~/apis/model/userYanglaoJinModel";
+import { CDN_URL } from "~/config/app";
+import { isNumber } from "~/utils";
+import { Accountbind } from "~/apis/auth.api";
 
 const zfb_logoImage = CDN_URL + '/static/assets/zfb_logo.png'
 const wx_logoImage = CDN_URL + '/static/assets/wx_logo.png'
 const userStore = useUserStore()
 const userSpreadInfo = ref<SpreadInfoModel>()
-
+//微信绑定标识
+const iswxshow = ref(false)
 const withdrawalCal = ref({})
 const yanglaojin = ref<UserYanglaoJinModel>()
 
@@ -27,7 +29,46 @@ const cashWithdrawalAmount = ref()
 const isDisabled = ref(true)
 const userBrokeragePrice = ref(0)
 // userSpreadInfo.value.brokerage_price
-onLoad(async () => {
+onShow(async () => {
+  cashWithdrawalAmount.value = null
+  getBandAccountInfo({ type: '1' }).then(res => {
+    iswxshow.value = true
+
+  }).catch((error) => {
+    setTimeout(() => {
+      uni.showModal({
+        title: '温馨提示',
+        content: '您还未绑定提现账号,是否绑定?',
+        cancelText: "取消", // 取消按钮的文字
+        confirmText: "确认绑定", // 确认按钮的文字
+        showCancel: true, // 是否显示取消按钮，默认为 true
+        confirmColor: '#f55850',
+        success: (res) => {
+          if (res.confirm) {
+            console.log('comfirm') //点击确定之后执行的代码
+            Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
+              console.log('我是resg', resg);
+
+              uni.showToast({
+                title: '绑定成功',
+                icon: 'none'
+              })
+              iswxshow.value = true
+            }).catch((error) => {
+              uni.showToast({
+                title: error,
+                icon: 'none'
+              })
+            })
+          } else {
+            console.log('cancel') //点击取消之后执行的代码
+            iswxshow.value = false
+          }
+        }
+      })
+    }, 300);
+
+  })
   await userStore.getUserInfo()
   // 佣金信息
   userSpreadInfo.value = await getUserSpreadInfo()
@@ -48,6 +89,7 @@ onLoad(async () => {
       icon: 'none'
     })
   }
+
   // }
 })
 
@@ -65,6 +107,37 @@ watch(() => cashWithdrawalAmount.value, (val) => {
   }
 })
 
+function Tochecked() {
+  iswxshow.value = !iswxshow.value
+  console.log(iswxshow.value);
+  if (iswxshow.value == true) {
+    Accountbind({ openid: userStore.openid, wx_type: '1' }).then(resg => {
+      console.log('我是resg', resg);
+
+      uni.showToast({
+        title: '绑定成功',
+        icon: 'none'
+      })
+      iswxshow.value = true
+    }).catch((error) => {
+      uni.showToast({
+        title: error,
+        icon: 'none'
+      })
+      if(error=='此微信已绑定其他账户'){
+        iswxshow.value=false
+      }
+    })
+  }else{
+    console.log(111);
+    
+  }
+}
+
+
+
+
+
 function handleInputAll() {
   // console.log(userSpreadInfo.value?.brokerage_price)
   if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && userSpreadInfo.value?.brokerage_price >= widthdrawalConfig.value.withdrawal_money) {
@@ -81,6 +154,7 @@ function handleInputAll() {
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+  
   if (isDisabled.value) {
     return
   }
@@ -139,20 +213,25 @@ function handleImmediateWithdrawal() {
     })
   }
 
+  if(iswxshow.value==false){
+    uni.showToast({
+      title: '请先勾选提现方式',
+      icon: 'none'
+    })
+    return
+  }
+
+  getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1 }).then(res => {
 
-  getApplicationWithdrawal({extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
-    // uni.showToast({
-    //   title: res,
-    //   icon: 'none'
-    // })
     uni.showToast({
-      title: '提现成功',
+      title: '提现已申请',
       icon: 'none'
-    }).then(res => {
+    })
+    setTimeout(() => {
       uni.navigateTo({
-        url: '/pages/immediate-withdrawal/index'
+        url: '/pages/withdrawal-record/index'
       })
-    })
+    }, 300)
   }).catch(error => {
     uni.showToast({
       title: error,
@@ -190,10 +269,7 @@ function handleShowAgreement(type) {
       <div class="flex justify-center items-center pt-4 f-hairline-bottom">
         <div class="text-lg font-bold">￥</div>
         <div class="flex-1">
-          <input placeholder="请输入金额" class="w-full"
-                 type="number"
-                 v-model="cashWithdrawalAmount"
-          />
+          <input placeholder="请输入金额" class="w-full" type="digit" v-model="cashWithdrawalAmount" />
         </div>
         <div class="text-xs text-red" @click="handleInputAll">全部提现</div>
       </div>
@@ -215,10 +291,11 @@ function handleShowAgreement(type) {
         <div class="flex items-center justify-between py-3">
           <div class="flex items-center gap-2">
             <image :src="wx_logoImage" mode="widthFix" class="w-8 h-8"></image>
-            <div>微信支付</div>
+            <div>微信</div>
           </div>
           <div>
-            <radio checked/>
+            <radio :checked="true" v-if="iswxshow==true" />
+            <radio :checked="false"  v-if="iswxshow==false" @click="Tochecked"  />
           </div>
         </div>
 
@@ -236,11 +313,8 @@ function handleShowAgreement(type) {
 
     <div class="flex flex-col">
       <div class=" flex rounded-full bg-red-300">
-        <nut-button type="primary" block
-                    :disabled="isDisabled"
-                    :class="isDisabled && 'bg-gray-800'"
-                    @tap="handleImmediateWithdrawal"
-        >
+        <nut-button type="primary" block :disabled="isDisabled" :class="isDisabled && 'bg-gray-800'"
+          @tap="handleImmediateWithdrawal">
           立即提现
         </nut-button>
       </div>
@@ -267,7 +341,6 @@ page {
   height: 16px !important;
   width: 16px !important;
 }
-
 </style>
 <route lang="yaml">
 style:

src/pages/miaosha/index.vue

@@ -12,7 +12,7 @@ const currentSeckillDate = ref()
 const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
 const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
 const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
-
+const userStore = useUserStore()
 // const list = ref<Array<DcSeckillModel>>()
 const currentProductList = ref([])
 
@@ -24,6 +24,7 @@ const state = reactive({
 
   list: []
 })
+
 onLoad((options) => {
   loadList('reload')
 })
@@ -43,33 +44,34 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   }).then( res => {
     if (action === 'reload') {
       if (res && res.length > 0) {
-        console.log(res)
+        console.log('秒杀>>>',res)
         const resList = res
         // const status3List = orderBy(list.value, (val) => {
         //   return val.status == 3
         // })
-        let status3FilterList = filter(resList, (val) => {
-          return val.status == 3
-        })
+        //val.status 1 开始抢 2 即将开始 3 已结束
+        // let status3FilterList = filter(resList, (val) => {
+        //   return val.status == 3
+        // })
         let status2FilterList = filter(resList, (val) => {
           return val.status == 2
         })
         let status1FilterList = filter(resList, (val) => {
           return val.status == 1
         })
-        if (status3FilterList.length >= 3) {
-          status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
-          console.log(status3FilterList)
-          state.list.push(...status3FilterList[0])
-          console.log(state.list)
-        } else {
-          state.list.push(...status3FilterList)
-        }
+        // if (status3FilterList.length >= 3) {
+        //   status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
+        //   console.log(status3FilterList)
+        //   state.list.push(...status3FilterList[0])
+        //   console.log(state.list)
+        // } else {
+        //   state.list.push(...status3FilterList)
+        // }
         if (status2FilterList.length > 0) {
           state.list.push(...status2FilterList)
         }
         if (status1FilterList.length > 0) {
-          state.list.push(...status1FilterList)
+          state.list.unshift(...status1FilterList)
         }
 
         if (state.list.length > 0) {

src/pages/my-integral/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import {useUserStore} from "~/stores/userStore";
-import {getNewSignInInfo, getUserInfo} from "~/apis/user";
+import { useUserStore } from "~/stores/userStore";
+import { getNewSignInInfo, getUserInfo } from "~/apis/user";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBButton from "~/components/CXBButton/CXBButton.vue";
 import CXBDialogSIgnIn from "~/components/CXBDialogSignIn/CXBDialogSIgnIn.vue";
@@ -27,7 +27,7 @@ function loadSignInInfo() {
   // 2 检查用户签到信息
   getNewSignInInfo().then(res => {
     console.log(res)
-    const {today, day} = res
+    const { today, day } = res
     state.signToday = today
     console.log(res)
     if (today == 0) {
@@ -68,7 +68,7 @@ if (userStore.userInfo) {
 function handleSign() {
   // console.log(state.signToday)
   // if (state.signToday == 0)  {
-    state.isShowSignIn = true
+  state.isShowSignIn = true
   // } else {
   //   return uni.showToast({
   //     title: '今日已签到过',
@@ -117,27 +117,19 @@ function handleShowAgreement() {
         {{ userStore.userInfo.score }}
       </div>
     </div>
-
+    <div @tap="handleShowIntegralDetail" class="bg-white rounded-md text-sm flex justify-between p-3">
+      <div class="">积分明细</div>
+      <div class="f-text-color-2 i-tabler-chevron-right transform transition-300" />
+    </div>
     <div class="bg-white rounded-md text-sm flex justify-between p-3">
       <div class="">积分通兑</div>
-      <FButton
-          @tap="handleToZibuyangsheng"
-          size="mini"
-          :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
-
-      >
+      <FButton @tap="handleToZibuyangsheng" size="mini"
+        :exClass="['rounded-full', '!text-[12px]', 'text-white', `bg-primary`, 'w-full']">
         去兑换
       </FButton>
     </div>
 
-    <div
-        @tap="handleShowIntegralDetail"
-        class="bg-white rounded-md text-sm flex justify-between p-3">
-      <div class="">积分明细</div>
-      <div
-          class="f-text-color-2 i-tabler-chevron-right transform transition-300"
-      />
-    </div>
+
 
     <div class="bg-white rounded-md text-sm flex flex-col p-3">
       <div class="f-hairline-bottom pb-3">积分任务</div>
@@ -147,11 +139,8 @@ function handleShowAgreement() {
             <div class="text-xs">每日签到</div>
             <div class="text-xs text-gray-500">每日签到得奖励</div>
           </div>
-          <FButton
-              @click="handleSign"
-              size="mini"
-              :exClass="['rounded-full','!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray' }`, 'w-full']"
-          >
+          <FButton @click="handleSign" size="mini"
+            :exClass="['rounded-full', '!text-[12px]', 'text-white', `${state.signToday === 0 ? 'bg-primary' : 'bg-gray'}`, 'w-full']">
             {{ state.signToday === 0 ? '去签到' : '已签到' }}
           </FButton>
         </div>
@@ -160,12 +149,8 @@ function handleShowAgreement() {
             <div class="text-xs">邀请好友得积分</div>
             <div class="text-xs text-gray-500">邀请好友赚奖励</div>
           </div>
-          <FButton
-              @tap="handleToPoster"
-              size="mini"
-              :exClass="['rounded-full','!text-[12px]', 'text-white', `bg-primary`, 'w-full']"
-
-          >
+          <FButton @tap="handleToPoster" size="mini"
+            :exClass="['rounded-full', '!text-[12px]', 'text-white', `bg-primary`, 'w-full']">
             去邀请
 
           </FButton>
@@ -176,13 +161,8 @@ function handleShowAgreement() {
     </div>
   </div>
 
-  <CXBDialogSIgnIn
-      :show="state.isShowSignIn"
-      :today="state.signToday"
-      :day="state.day"
-      @confirm="state.isShowSignIn = false"
-      @close="state.isShowSignIn = false"
-  />
+  <CXBDialogSIgnIn :show="state.isShowSignIn" :today="state.signToday" :day="state.day"
+    @confirm="state.isShowSignIn = false" @close="state.isShowSignIn = false" />
 </template>
 
 <style>

src/pages/my-invitation/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import FCellGroup from "~/components/FCellGroup/FCellGroup.vue";
 import FCell from "~/components/FCell/FCell.vue";
-import {getAgentInfo, getSelectUserInviteProfit} from "~/apis/user";
+import {getAgentInfo, getSelectUserInviteProfit, getUserUnionId} from "~/apis/user";
 const userStore = useUserStore()
 const list = [{
   title: '邀请伙伴',
@@ -18,6 +18,9 @@ const list = [{
 }, {
   title: '去提现',
   url: '/pages/immediate-withdrawal/index'
+},{
+  title: '支付平台绑定',
+  url: '/pages/third_party_binding/index'
 }]
 
 
@@ -43,6 +46,24 @@ const userInviteProfit = reactive({
 })
 onLoad(() => {
   console.log('load...')
+  uni.login({
+    provider: 'weixin',
+    univerifyStyle: {
+      fullScreen: true
+    },
+    success: result => {
+      // console.log(result)
+      getUserUnionId({
+        code: result.code,
+        source: 'cxb'
+      }).then(unionRes => {
+        console.log(111111, unionRes)
+        // const shareId = Cache.get('SHARE_ID')
+        //存储openid
+        userStore.setOpenid(unionRes.openid)
+      })
+    }
+  })
   getSelectUserInviteProfit({ uid: userStore.uid }).then(res => {
     console.log(res)
     const inviteData = res.data

src/pages/my-rules/index.vue

@@ -252,25 +252,32 @@ function handleShowAnnuityDetail() {
 const ruleId = computed(() => {
   const userRichType = userStore.userInfo?.user_rich_type
 
-  // console.log(userRichType)
+  console.log('我是》》》',userRichType)
   // 创始人
-  if (userRichType === 3) {
+  if (userRichType == 3) {
     return 21
   }
   // 用户
-  if (userRichType === 0) {
+  if (userRichType == 0) {
     return 18
   }
   // 会员
-  if (userRichType === 1) {
+  if (userRichType ==1) {
     return 19
   }
-  // 合伙人
-  if (userRichType === 2 || userRichType == 4) {
+  // 高级会员
+  if (userRichType == 4) {
     return 20
   }
-
-  return 18
+  // 合伙人
+  if (userRichType == 8 ) {
+    return 24
+  }
+  //联合创始人
+  if (userRichType == 9 ) {
+    return 22
+  }
+  
 })
 const agentInfo = ref({})
 
@@ -279,6 +286,8 @@ onShow(() => {
   if (ruleId.value) {
     // console.log(ruleId.value)
     getRules(ruleId.value).then(res => {
+      console.log(1111111222,res);
+      
       ruleDetail.value = res
     }).catch(error => {
       uni.showToast({
@@ -299,7 +308,7 @@ function handleUserUpgrade() {
   if (ruleId.value < 20) {
     const id = ruleId.value + 1
     getRules(id).then(res => {
-      console.log(res);
+      console.log('woshi111',res);
       
       ruleDetail.value = res
       showUpgradeInfo.value = true
@@ -307,7 +316,7 @@ function handleUserUpgrade() {
   }else if(ruleId.value = 20){
     const id = ruleId.value + 4
     getRules(id).then(res => {
-      console.log(res);
+      console.log('我是合伙人',res);
       
       ruleDetail.value = res
       showUpgradeInfo.value = true

src/pages/order/components/AllItemList.vue

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

src/pages/order/components/OrderItem.vue

@@ -39,7 +39,10 @@ const props = defineProps({
 //     }
 //   }
 // })
+//全部订单页面
 function getStatusText(orderItem: OrderListModel) {
+  // console.log('我是》',orderItem.status);
+
   // if (props.status === 5) {
   //   return '未支付'
   // }
@@ -66,8 +69,11 @@ function getStatusText(orderItem: OrderListModel) {
   if (orderItem.status == 4) {
     return '已申请退款'
   }
-  if (orderItem.status == 5) {
-    return '未支付'
+  if (orderItem.status === 5) {
+    return '已取消订单'
+  }
+  if (orderItem.status === '5') {
+    return '待付款'
   }
 }
 
@@ -80,28 +86,39 @@ function handleHeaderClick() {
 /**
  * 取消订单
  */
+
 function handleCancelOrder() {
-  console.log('取消订单操作')
-  cancelOrder(props.orderItem.group_order_id).then(res => {
-    setTimeout(() => {
-      uni.showToast({
-        title: '取消成功',
-        icon: 'none'
-      })
-
-      // if (props.tabValue)
-      uni.$emit('orderCancelFromList', props.tabValue)
-
-    }, 300)
-
-  }).catch(error => {
-    // uni.showToast({
-    //   title: error,
-    //   icon: 'none'
-    // })
-  })
+  uni.showModal({
+    title: '取消订单',
+    content: '您确定要取消订单吗？',
+    confirmColor: '#FE0032',
+    success: function (modalRes) {
+      if (modalRes.confirm) {
+        console.log('用户点击确定', props.orderItem.group_order_id);
+        cancelOrder(props.orderItem.group_order_id)
+          .then(res => {
+            uni.showToast({
+              title: '取消成功',
+              icon: 'none'
+            });
+            // 如果需要刷新订单列表，可以触发事件
+            // if (props.tabValue)
+            uni.$emit('orderCancelFromList', props.tabValue);
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error, // 或者使用 error 信息
+              icon: 'none'
+            });
+          });
+      } else if (modalRes.cancel) {
+        console.log('用户点击取消', props.orderItem.group_order_id);
+      }
+    }
+  });
 }
 
+
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
@@ -306,13 +323,18 @@ function handleShowObligationOrderDetail(orderItem) {
 
         </div>
 
-        <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
+        <div class="flex justify-end gap-2" v-if="orderItem.status === '5'">
+          <div class="title-line">09:02:00后订单将关闭</div>
           <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 === 5">
+
+
+        </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>
@@ -333,7 +355,17 @@ function handleShowObligationOrderDetail(orderItem) {
           <nut-button size="small" plain type="primary" @tap.stop="handleComment(orderItem)">去评价</nut-button>
 
         </div>
+      </div>
     </div>
-  </div>
 
-</div></template>
+  </div>
+</template>
+<style  scoped>
+.title-line {
+  font-size: 24rpx;
+  /* 字体大小 */
+  color: #333;
+  line-height: 56rpx;
+  margin-right: 80rpx;
+}
+</style> 

src/pages/order/components/OrderObligationItem.vue

@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
-import {OrderListModel} from "~/apis/model/order.model";
-import {cancelOrder, takeOrder} from "~/apis/order.api";
-import {encodeBase64} from "~/utils/http/helper";
-import {deleteAddress} from "~/apis/user";
+import { OrderListModel } from "~/apis/model/order.model";
+import { cancelOrder, takeOrder } from "~/apis/order.api";
+import { encodeBase64 } from "~/utils/http/helper";
+import { deleteAddress } from "~/apis/user";
 import {
   DyProductModel,
   JdProductModel,
   SuNingProductModel,
   TaobaoProductThirdPartyWaresModel, VipProductModel
 } from "~/apis/model/product.model";
-import {DcProductModel} from "~/apis/model/dacang.model";
+import { DcProductModel } from "~/apis/model/dacang.model";
 const props = defineProps({
   orderItem: {
     type: Object,
@@ -24,6 +24,9 @@ const props = defineProps({
   }
 })
 
+
+
+
 // function detailOrderList(p) {}
 // const dealOrderList =computed(() => {
 //   if (props.orderItem) {
@@ -63,8 +66,11 @@ function getStatusText(orderItem: OrderListModel) {
   if (orderItem.status == 4) {
     return '已申请退款'
   }
-  if (orderItem.status == 5) {
-    return '未支付'
+  if (orderItem.status === 5) {
+    return '待付款'
+  }
+  if (orderItem.status === '5') {
+    return '已取消'
   }
 }
 
@@ -78,19 +84,34 @@ function handleHeaderClick() {
  * 取消订单
  */
 function handleCancelOrder() {
-  console.log('取消订单操作')
-  cancelOrder(props.orderItem.group_order_id).then(res => {
-    setTimeout(() => {
-      uni.showToast({
-        title: '取消成功',
-        icon: 'none'
-      })
-
-      uni.$emit('orderCancelFromList')
-      
-    }, 300)
-
-  })
+  uni.showModal({
+    title: '取消订单',
+    content: '您确定要取消订单吗？',
+    confirmColor: '#FE0032',
+    success: function (modalRes) {
+      if (modalRes.confirm) {
+        console.log('用户点击确定', props.orderItem.group_order_id);
+        cancelOrder(props.orderItem.group_order_id)
+          .then(res => {
+            uni.showToast({
+              title: '取消成功',
+              icon: 'none'
+            });
+            // 如果需要刷新订单列表，可以触发事件
+            // if (props.tabValue)
+            uni.$emit('orderCancelFromList', props.tabValue);
+          })
+          .catch(error => {
+            uni.showToast({
+              title: error, // 或者使用 error 信息
+              icon: 'none'
+            });
+          });
+      } else if (modalRes.cancel) {
+        console.log('用户点击取消', props.orderItem.group_order_id);
+      }
+    }
+  });
 }
 
 function handlePayment() {
@@ -156,7 +177,7 @@ function handleComment(orderItem) {
 }
 
 function handleProductItemClick(
-    item
+  item
 ) {
   // function navigateToDetail(params) {
   //   let otherDetailUrl = `/pages/store/product/other`
@@ -184,13 +205,56 @@ function handleShowObligationOrderDetail(orderItem) {
     url: '/pages/order/obligation-detail?detail=' + `${encodeBase64(orderItem)}&type=1`
   })
 }
+
+
+
+// const remainingTime: any = ref({
+//   hours: 0,
+//   minutes: 0,
+//   seconds: 0
+// })
+// //计算取消时间
+// function updateRemainingTime(detail: any) {
+//   const currentTime = new Date().getTime();
+//   const endTime = new Date(detail.close_time).getTime();
+//   const timeDifference = endTime - currentTime;
+
+//   // 计算剩余时间
+//   const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+//   const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+//   const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+
+//   // 更新数据
+//   remainingTime.value = {
+//     hours: hours < 10 ? '0' + hours : hours,
+//     minutes: minutes < 10 ? '0' + minutes : minutes,
+//     seconds: seconds < 10 ? '0' + seconds : seconds
+//   }
+// }
+
+
+// // 每秒更新剩余时间
+// const timer = setInterval(() => {
+//   if (remainingTime.hours <= 0 && remainingTime.minutes <= 0) {
+//     // 达到设定时间，执行关闭操作，你可以在这里添加你的关闭逻辑
+//     clearInterval(timer);
+//     console.log('自动关闭');
+//   }
+//   updateRemainingTime(props.orderItem)
+// }, 1000);
+
+// onUnload(() => {
+//   clearInterval(timer);
+//   console.log('卸载关闭');
+// })
+
+
+
 </script>
 
 <template>
   <div class="mb-3 bg-white rounded p-3">
-    <div
-        @click.stop="handleHeaderClick"
-        class="flex items-center justify-between f-hairline-bottom pb-3">
+    <div @click.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">
           <image :src="orderItem.merchant.mer_avatar" mode="widthFix" class="w-4 h-4"></image>
@@ -214,7 +278,7 @@ function handleShowObligationOrderDetail(orderItem) {
               <div class="flex-1 flex gap-2">
                 <div class="flex w-20 h-20">
 
-                <image :src="orderProduct.cart_info.product.image" class="w-20 h-20" mode="widthFix"></image>
+                  <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]">
@@ -236,7 +300,11 @@ function handleShowObligationOrderDetail(orderItem) {
           </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>
+          <!-- <div class="title-line">{{ remainingTime.hours }}:{{ remainingTime.minutes }}:{{ remainingTime.seconds }}后订单将关闭
+          </div> -->
+          <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>
@@ -245,6 +313,14 @@ function handleShowObligationOrderDetail(orderItem) {
     </div>
 
   </div>
-
-
 </template>
+
+<style scoped>
+.title-line {
+  font-size: 24rpx;
+  /* 字体大小 */
+  color: #333;
+  line-height: 56rpx;
+  margin-right: 80rpx;
+}
+</style>

src/pages/order/index.vue

@@ -78,7 +78,7 @@ const getStatusVal = () => {
   }
 }
 onLoad(options => {
-  console.log(options)
+  console.log('我是options》》',options)
   if (options && options.tabIndex) {
     state.tabvalue = options.tabIndex
   }

src/pages/order/logistics.vue

@@ -196,7 +196,7 @@ function handleMakePhoneCall() {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          大家都在买
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index-bak.vue

@@ -569,7 +569,7 @@ function handleNumberChange(num, goodItem) {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+      精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index-new.vue

@@ -439,7 +439,7 @@ function handleNumberChange(num, goodItem) {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>

src/pages/order_addcart/index.vue

@@ -86,7 +86,6 @@ function handleCreateShopping() {
     //     })
     //   } else {
     //     uni.$emit('cart-reload')
-
     //     uni.showToast({
     //       title: '添加购物车成功',
     //       icon: 'none'
@@ -126,17 +125,19 @@ function handleCountChange(val) {
 let Scroll_X = ref(0)
 
 const shopping = ref<ShoppingResult>()
-
 onBeforeMount(() => {
+  userStore.setRedirectPage(`/pages/order_addcart/index`, 'tab')
+})
+onLoad((options) => {
+
   if (!userStore.uid) {
-    return uni.navigateTo({
-      url: '/user/login/index'
+    return uni.redirectTo({
+      url: '/pages/user/login/index'
     })
   }
-})
-onLoad((options) => {
   uni.$on('cart-reload', () => {
     // console.log('新商品添加...')
+    state.recommendList = []
     state.cart_id = []
     loadCartList()
   })
@@ -155,6 +156,7 @@ onShow(() => {
     state.isManage = true
   }
   loadCartCount()
+  loadCartList()
   loadList('reload')
 })
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
@@ -203,8 +205,21 @@ onReachBottom(() => {
 
 })
 
+//监视用户变化
+// watch(() => userStore.uid, (newUid, oldUid) => {
+//   // 在这里处理 uid 变化的逻辑
+//   console.log('uid 变化了，新值:', newUid, '旧值:', oldUid);
+//   if (newUid != oldUid && newUid != null) {
+//     loadCartList()
+//   }
+
+//   // 你可以在这里执行其他操作，例如发起网络请求等
+// })
+
+
 // 加载购物车数据
 function loadCartList() {
+
   uni.showLoading({
     title: '加载中',
     icon: 'none'
@@ -212,6 +227,8 @@ function loadCartList() {
   // state.totalCartCount = 0
   getCartList().then(res => {
     uni.hideLoading()
+    console.log('我是初始化gwc数据', res);
+
     shopping.value = res
 
     // console.log('shoping',res)
@@ -563,6 +580,12 @@ function openTestLog(element) {
   })
 }
 
+//卸载
+onUnload(() => {
+  state.recommendList = []
+  state.cart_id = []
+})
+
 </script>
 <template>
   <div class="">
@@ -582,9 +605,9 @@ function openTestLog(element) {
         暂无商品，去添加喜欢的商品
       </div>
     </div>
-    <div v-else class="mt-10">
+    <div v-else class="mt-10 pb-10 ">
 
-      <div v-if="shopping && shopping.list" class="flex flex-col gap-4 p-3">
+      <div v-if="shopping && shopping.list" class="flex flex-col gap-4 px-3 pt-3 pb-8 ">
         <div v-for="(shopItem, index) in shopping.list" :key="index" class="bg-white rounded-lg  ">
           <div class="f-hairline-bottom flex  items-center font-bold p-3">
             <div @tap.stop="handleShopTitleClick(shopItem)">
@@ -639,7 +662,7 @@ function openTestLog(element) {
       <div class="flex flex-row justify-center items-center gap-3 font-bold text-sm p-3 ">
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
         <div>
-          猜你喜欢
+          精品推荐
         </div>
         <image :src="like_adorn_220628Image" mode="widthFix" class="w-6 h-6"></image>
       </div>
@@ -698,28 +721,32 @@ page {
   border-radius: 10px;
   height: 38rpx;
   line-height: 38rpx;
-  font-size: 28rpx;
-  color: #666666;
+  font-size: 24rpx;
+  color: #919191;
   display: flex;
 }
 
 .m-live {
   max-width: 350rpx;
-  margin-left: 4rpx;
+  margin-left: 8rpx;
   margin-right: 4rpx;
-  overflow: hidden; /* 溢出内容隐藏 */
-  white-space: nowrap; /* 不换行 */
-  text-overflow: ellipsis; /* 超出部分显示省略号 */
+  overflow: hidden;
+  /* 溢出内容隐藏 */
+  white-space: nowrap;
+  /* 不换行 */
+  text-overflow: ellipsis;
+  /* 超出部分显示省略号 */
 }
 
 .m-lift {
-  margin-left: 4rpx;
-  margin-right: 4rpx;
+  margin-left: 8rpx;
+  margin-right: 8rpx;
 }
 
 .thumbnail_1 {
-  width: 24rpx;
-  height: 14rpx;
+  width: 12rpx;
+  height: 7rpx;
+  margin-bottom: 6rpx;
 }
 </style>
 <route lang="yaml">

src/pages/payment/index.vue

@@ -27,7 +27,7 @@
 
 
     <div class="fixed bottom-0 pb-safe  w-full">
-      <div class="px-3">
+      <div class="p-4">
         <nut-button block type="primary" @click="handleConfirm">立即支付</nut-button>
       </div>
 

src/pages/pension_account/index.vue

@@ -10,6 +10,8 @@ const userYangLaoJin = ref({})
 
 onLoad(() => {
   getUserYangLaoJin().then(res => {
+    console.log('养老保险',res);
+    
     userYangLaoJin.value = res
   })
 })

src/pages/product/dingshenglianmeng.vue

@@ -1,32 +1,23 @@
 <template>
   <CXBBasePage>
     <scroll-view>
-		<div class="h-45">
-		  <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=" 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="h-45">
+        <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=" 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="p-3">
+        <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
         <div>
-          <grid-view type="masonry" cross-axis-count="2" 	cross-axis-gap="10px" main-axis-gap="10px">
-            <div v-for="(item, index) in list"
-                 @tap="handleItemClick(item)"
-                 :key="index"
-            >
+          <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
+            <div v-for="(item, index) in list" @tap="handleItemClick(item)" :key="index">
 
               <div class="bg-white rounded-lg">
-                <image :src="item.image" mode="widthFix" 	:fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
+                <image :src="item.image" mode="widthFix" :fade-in="true" class="rounded-t-lg  !w-full aspect-square" />
                 <div class="text-sm p-2 flex flex-col gap-2">
                   <div class="line-clamp-2">
                     {{ item.store_name }}
@@ -37,7 +28,7 @@
                   </div>
                   <div class="line-through text-xs font-bold text-gray-400 flex ">
                     <div>
-                      ¥ {{item.ot_price}}
+                      ¥ {{ item.ot_price }}
                     </div>
                   </div>
                 </div>
@@ -52,15 +43,15 @@
 
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
-import {getTypeProductList} from "~/apis/merchant";
-import {getHomeBanner} from "~/apis/common";
-
+import { getTypeProductList } from "~/apis/merchant";
+import { getHomeBanner } from "~/apis/common";
+import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
   totalPage: 1,
   banners: [],
-  keyword: '' ,
+  keyword: '',
   status: 'noMore',
   indicatorDots: true,
   circular: true,
@@ -68,61 +59,61 @@ const state = reactive({
   interval: 5000,
   duration: 500,
   currents: "0",
-  title:'',
-  type:'',
+  title: '',
+  type: '',
 })
-const list = ref()
+const list = ref([])
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: `/pages/store/product/detail?id=`+item.product_id
+    url: `/pages/store/product/detail?id=` + item.product_id
   })
 }
 
 onLoad((option) => {
-	state.type=option.type;	//获取url参数
-	if(state.type=='jingpin'){
-		state.title='精品大仓'
-	}else if(state.type=='dingsheng'){
-		state.title='鼎盛联盟'
-	}
-
-
-	getHomeBanner(state.type+"_banner").then(res => {
-		state.banners = res
-	})
-	loadList('reload')
-	
+  state.type = option.type;	//获取url参数
+  if (state.type == 'jingpin') {
+    state.title = '精品商城'
+  } else if (state.type == 'dingsheng') {
+    state.title = '鼎盛联盟'
+  } 
+
+
+  getHomeBanner(state.type + "_banner").then(res => {
+    state.banners = res
+  })
+  loadList('reload')
+
 })
 
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-	if (action === 'reload') {
-	  state.currentPage = 1
-	}
-	
-	const params = {
-		type :state.type,
-		page: state.currentPage,
-		limit: state.pageSize
-	}
-	getTypeProductList({
-		...params
-	}).then(res => {
-		if (res) {
-			if (action === 'reload') {
-				list.value = res.list
-			}else if (action === 'page') {
-			  list.value = list.value.concat(res.list)
-			}
-			state.totalPage = Math.ceil(res.count / state.pageSize);
-			state.status = 'more'
-			
-			if (callback) {
-			      callback(res.list)
-			}
-		}
-	})
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+
+  const params = {
+    type: state.type,
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+  getTypeProductList({
+    ...params
+  }).then(res => {
+    if (res) {
+      if (action === 'reload') {
+        list.value = res.list
+      } else if (action === 'page') {
+        list.value = list.value.concat(res.list)
+      }
+      state.totalPage = Math.ceil(res.count / state.pageSize);
+      state.status = 'more'
+
+      if (callback) {
+        callback(res.list)
+      }
+    }
+  })
 }
 
 
@@ -149,20 +140,33 @@ onReachBottom(() => {
 })
 
 onPullDownRefresh(() => {
-  loadList('reload', function() {
+  loadList('reload', function () {
     setTimeout(() => {
       uni.stopPullDownRefresh()
     }, 300)
   })
 })
 
-onShow(() =>{
-    uni.setNavigationBarTitle({
-      title: state.title // 设置新的导航栏标题
-    });
+onShow(() => {
+  uni.setNavigationBarTitle({
+    title: state.title // 设置新的导航栏标题
+  });
 })
 
 
+// 距离顶部距离
+let Scroll_X = ref(0)
+const headerClass = ref('')
+onPageScroll((page) => {
+  Scroll_X.value = Number(page.scrollTop.toFixed())
+  // page.scrollTop
+  if (page.scrollTop >= 76) {
+    headerClass.value = '!bg-primary !text-white'
+  } else {
+    headerClass.value = ''
+  }
+})
+
 </script>
 
 <route lang="yaml">

src/pages/real-name-authentication/index.vue

@@ -263,7 +263,7 @@ function formatName (str) {
           <image  v-if="formData.card_positive && !state.isCertified"
                   :src="formData.card_positive"
                   @tap="handleUploadImg('positive')"
-                  mode="aspectFit" class="w-60 h-40"></image>
+                  mode="scaleToFill" class="w-60 h-40"></image>
           <image v-else
                  :src="front_220714Image"
                  @tap="handleUploadImg('positive')"
@@ -279,7 +279,7 @@ function formatName (str) {
           <image  v-if="formData.card_reverse && !state.isCertified"
                   :src="formData.card_reverse"
                   @tap="handleUploadImg('reverse')"
-                  mode="widthFix" class="w-60"></image>
+                  mode="scaleToFill" class="w-60 h-40 "></image>
           <image v-else
                  :src="verso_220714Image"
                  @tap="handleUploadImg('reverse')"

src/pages/setting/index.vue

@@ -64,7 +64,7 @@ function onOk() {
     </div>
 
     <div class="fixed bottom-0 pb-safe w-full">
-      <div class="px-10 ">
+      <div class="px-10 py-4 ">
         <div
             @tap="handleLogout"
             class="text-center text-white bg-primary rounded-full text-sm p-2"

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

@@ -57,15 +57,18 @@ const is148Merchant = computed(() => {
       <div class="line-clamp-2">
         {{item.store_name}}
       </div>
-      <div v-if="!is148Merchant" class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
+      <div v-if="item.type!=15" >
+        <div v-if="!is148Merchant" class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit">
         <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
                mode="widthFix" class="!w-8.5"></image>
-        <div class="px-2 flex items-center jusitify-center text-xs">
+        <div class="px-2 flex items-center jusitify-center text-xs"  >
           <div>
             养老金 ¥{{item.yanglao || item.yanglao_price}}
           </div>
         </div>
       </div>
+      </div>
+      
       <div class="flex flex-row items-center gap-2">
         <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>

src/pages/store/product/detail.vue

@@ -62,6 +62,10 @@ const state = reactive({
   cartNum: 1,
   cartCount: NaN,
   shareImage: '',
+  status: '', //加载状态
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 0
 })
 const detail: any = ref(null)
 const isTo = ref(3)
@@ -94,9 +98,29 @@ uni.showShareMenu({
   withShareTicket: true,
   menus: ['shareAppMessage', 'shareTimeline']
 })
+
 onLoad((option: any) => {
-  console.log("我是商品详情页");
+  // console.log("我是商品详情页");
+  //二维码扫码传id/shareid
+  if (option.scene) {
+    let queryString = decodeURIComponent(option.scene)
+    // 将字符串按 '&' 分割成数组
+    const paramsArray = queryString.split('&');
+    for (const param of paramsArray) {
+      if (param.includes('id=')) {
+        // 使用 split('=') 获取参数值
+        option.id = param.split('=')[1];
+        break;
+      }
+      if (param.includes('shareID=')) {
+        // 使用 split('=') 获取参数值
+        option.shareID = param.split('=')[1];
+        break;
+      }
 
+    }
+
+  }
   uni.showLoading({
     title: '数据加载中',
     icon: 'none'
@@ -116,13 +140,6 @@ onLoad((option: any) => {
 
   }
 
-  // }
-  getRecommendList({
-    page: 1,
-    limit: 10
-  }).then(res => {
-    state.recommendList = res.list
-  })
 
   getShareId({ pid: state.id, type: 1 }).then(res => {
     state.shareId = res.share_id
@@ -142,7 +159,7 @@ function loadProductDetail() {
     if (res.status === 200) {
       detail.value = res.data
       console.log('我是detail', detail.value);
-
+      loadList('reload')
       state.shareImage = detail.value.image
       if (res && res.mer_id && res.mer_id === '148') {
         if (detail.value && detail.value.price) {
@@ -158,12 +175,10 @@ function loadProductDetail() {
           console.info(res)
         })
       }
-
-      // if (detail.value.mer_id === '148') {
-      // }
       uni.hideLoading()
     } else {
       isShow.value = true
+      loadList('reload')
       uni.setNavigationBarTitle({
         title: '商品下架不存在'
       })
@@ -258,6 +273,55 @@ function loadCartCount() {
     }
   })
 }
+
+//列表加载
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
+
+  getRecommendList({
+    ...params
+  }).then(res => {
+    if (action === 'page') {
+      state.recommendList = state.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      state.recommendList = res.list
+    }
+    state.totalPage = Math.ceil(res.count / state.pageSize);
+    state.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+  // console.log(state.totalPage)
+  if (state.currentPage > state.totalPage) {
+    state.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+
 // const skuData = computed(() => {
 //   const skuList = []
 //   if (detail.value && detail.sku) {
@@ -272,6 +336,7 @@ function loadCartCount() {
 //     }
 //   }
 // })
+
 const is148Merchant = computed(() => {
   return detail.value && detail.value.mer_id && detail.value.mer_id == '148'
 })
@@ -301,6 +366,8 @@ function handleShowShopCart() {
 }
 
 function onSelectedSku(item: any) {
+  console.log('我是item', item);
+
   state.currentSku = item
 }
 
@@ -311,6 +378,10 @@ function handleAddCart() {
 
 
 }
+function handleSubQg() {
+  isTo.value = 4
+  state.isShowSku = false
+}
 
 function handleCreateShopping() {
   // console.log(state.flag)
@@ -320,13 +391,13 @@ function handleCreateShopping() {
     // product_attr_unique: JSON.stringify(state.currentSku),
     product_attr_unique: state.currentSku.unique,
     cart_num: state.cartNum,
-    is_new: (state.flag === '1' || state.flag === '3') ? '1' : '0'
+    is_new: (state.flag === '1' || state.flag === '3'|| state.flag == '5') ? '1' : '0'
   }).then(res => {
     console.log('resres', res)
 
     if (res.cart_id) {
       // console.log(state.flag)
-      if (state.flag == '1' || state.flag == '3') {
+      if (state.flag == '1' || state.flag == '3' || state.flag == '5') {
         isTo.value = state.flag
         console.log(isTo.value)
         uni.navigateTo({
@@ -370,15 +441,15 @@ function handleCreateShopping() {
     //       })
     // }
     console.log('我是error>>>', error);
-
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
       uni.showToast({
         title: '请登录',
         icon: 'none'
       })
       setTimeout(() => {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
+        uni.redirectTo({
+          url: '/pages/user/login/index?key=4'
         })
       }, 500)
     } else {
@@ -424,15 +495,15 @@ function handleBuyshow() {
     //   })
     // }
     console.log('我是error>>>', error);
-
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
       uni.showToast({
         title: '请登录',
         icon: 'none'
       })
       setTimeout(() => {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
+        uni.redirectTo({
+          url: '/pages/user/login/index?key=4'
         })
       }, 500)
     } else {
@@ -485,14 +556,16 @@ function handleAddshow() {
     //   })
     // }
     console.log('我是error>>>', error);
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (error === '请登录') {
+
       uni.showToast({
         title: '请登录',
         icon: 'none'
       })
       setTimeout(() => {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
+        uni.redirectTo({
+          url: '/pages/user/login/index?key=4'
         })
       }, 500)
     } else {
@@ -503,29 +576,46 @@ function handleAddshow() {
     }
   })
 }
+
+//活动未开始
+function notStarted() {
+  setTimeout(() => {
+    uni.showToast({
+      title: '秒杀未开始',
+      icon: 'none'
+    })
+  }, 300)
+
+}
+
 // 规格显示双按钮
 function handleTwobtn() {
   isTo.value = 2
   state.isShowSku = !state.isShowSku
 }
+function handleQgbtn() {
+  isTo.value = 4
+  state.isShowSku = !state.isShowSku
+}
 
 /**
  *
  * @param flag //1表示立即购买;2表示加入购物车,3表示立即兑换
  */
-function handleOrderConfirm(flag: '1' | '2' | '3') {
+function handleOrderConfirm(flag: '1' | '2' | '3' | '5') {
   console.log('我是》》》》》》', userStore.uid);
 
   debounce(() => {
+    userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}&from=share&shareID=${state.shareId}`, 'page')
     if (!userStore.uid) {
       return uni.showToast({
         title: '请登录',
         icon: 'none'
       }).then(() => {
         setTimeout(() => {
-          return uni.navigateTo({
-            url: '/pages/user/login/index'
-          })
+          uni.redirectTo({
+          url: '/pages/user/login/index?key=4'
+        })
         }, 500)
 
       })
@@ -674,7 +764,7 @@ onPageScroll((page) => {
         <div class="flex flex-col">
           <div class="flex gap-2 items-center text-white">
             <div class="text-[30px] font-bold">
-              <text class="text-[20px]">￥</text>{{ detail.price }}
+              <text class="text-[20px]">￥</text>{{ detail.seckill_s == 0 ? detail.price : detail.dc_price }}
             </div>
             <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
           </div>
@@ -715,7 +805,7 @@ onPageScroll((page) => {
           </div>
           <div v-else>
             <div v-if="detail.price">
-              ￥ {{ detail.price }}
+              ￥ {{ detail.seckill_s == 0 ? detail.price : detail.dc_price }}
             </div>
           </div>
           <div v-if="!is148Merchant" class="line-through text-xs font-bold flex text-gray-600">
@@ -770,7 +860,17 @@ onPageScroll((page) => {
       </div>
     </div>
 
-    <FCell arrow @tap="handleTwobtn">
+    <FCell arrow @tap="handleQgbtn" v-if="detail.seckill_s != 0">
+      <template #title>
+        <div class="flex items-center" v-if="state.currentSku">
+          <div class="font-bold">规格：</div>
+
+          {{ state.currentSku.sku }}
+        </div>
+
+      </template>
+    </FCell>
+    <FCell arrow @tap="handleTwobtn" v-if="detail.seckill_s == 0">
       <template #title>
         <div class="flex items-center" v-if="state.currentSku">
           <div class="font-bold">规格：</div>
@@ -788,8 +888,8 @@ onPageScroll((page) => {
 
     <!-- 店铺信息 -->
     <div @tap="handleShowMerchant(detail.mer_id)" class="flex gap-3 p-3 bg-white">
-      <div v-if="detail && detail.merchant">
-        <image :src="detail.merchant.mer_avatar" mode="widthFix" class=" h-12 w-12"></image>
+      <div v-if="detail && detail.merchant" class=" h-12 w-12">
+        <image :src="detail.merchant.mer_avatar" mode="aspectFit" class="img_full"></image>
       </div>
       <div class="flex flex-col gap-2 justify-center" v-if="detail && detail.merchant">
         <div class="flex text-xs items-center">
@@ -802,12 +902,12 @@ onPageScroll((page) => {
       </div>
 
     </div>
-    <div class="flex flex-col bg-white">
+    <div class="flex flex-col bg-white" v-if="detail.merchant.recommend.length>=3" >
       <div class="p-3">
         <div
           class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
           <div class="pl-2">
-            为你推荐
+            店铺推荐
           </div>
         </div>
       </div>
@@ -849,7 +949,7 @@ onPageScroll((page) => {
         <div
           class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
           <div class="pl-2">
-            猜你喜欢
+            精品推荐
           </div>
         </div>
       </div>
@@ -860,6 +960,14 @@ onPageScroll((page) => {
 
           </div>
         </grid-view>
+        <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>
 
     </div>
@@ -883,17 +991,25 @@ onPageScroll((page) => {
         <div
           class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
           <div class="pl-2">
-            猜你喜欢
+            精品推荐
           </div>
         </div>
       </div>
-      <div class="pb-3 px-3" v-if="state.recommendList.length != 0">
+      <div class="pb-3 px-3" v-if="state.recommendList">
         <grid-view type="masonry" cross-axis-count="2" cross-axis-gap="10px" main-axis-gap="10px">
           <div v-for="(item, index) in state.recommendList" :key="index" @click="handleProductItemClick(item)">
             <MerchantProductCard :item="item" />
 
           </div>
         </grid-view>
+        <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>
 
     </div>
@@ -926,7 +1042,7 @@ onPageScroll((page) => {
           <div class="text-[11px]">购物车</div>
         </div>
       </div>
-      <div class="flex flex-row text-sm text-white gap-2 pr-3">
+      <div class="flex flex-row text-sm text-white gap-2 pr-3" v-if="detail.seckill_s == 0">
         <div @tap="handleAddCart" v-if="!is148Merchant"
           class="bg-[#FFA319] rounded-full w-25 flex justify-center items-center h-9">
           加入购物车
@@ -936,17 +1052,23 @@ onPageScroll((page) => {
           <div v-else @click="handleOrderConfirm('1')">立即购买</div>
         </div>
       </div>
-      <!-- <div class="flex flex-row text-sm text-white gap-2 pr-3">
-        <div class="bg-[#F94032] rounded-full w-25 flex justify-center items-center h-9">
-          <div @click="handleOrderConfirm('1')">立即抢购</div>
+
+      <div class="flex flex-row text-sm text-white gap-2 px-4" v-if="detail.seckill_s == 2">
+        <div class="bg-[#F94032] rounded-full w-52 flex justify-center items-center h-9">
+          <div @click="notStarted">立即抢购</div>
+        </div>
+      </div>
+      <div class="flex flex-row text-sm text-white gap-2 px-4" v-if="detail.seckill_s == 1">
+        <div class="bg-[#F94032] rounded-full w-52 flex justify-center items-center h-9">
+          <div @click="handleOrderConfirm('5')">立即抢购</div>
         </div>
-      </div> -->
+      </div>
     </div>
 
 
   </div>
 
-  <CXBSkuPopup v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku"
+  <CXBSkuPopup v-model:show="state.isShowSku" :detail="detail" @selected:item="onSelectedSku" @subQg="handleSubQg"
     @submit="handleCreateShopping" @count-change="handleCountChange" @subBuy="handleBuyshow" @subAdd="handleAddshow"
     :isTo="isTo" />
   <!--  <nut-sku-->
@@ -996,6 +1118,11 @@ page {
   background-color: #f8f8f8;
 }
 
+.img_full {
+  width: 100%;
+  height: 100%;
+}
+
 button {
   margin: 0;
   padding: 0;
@@ -1011,12 +1138,12 @@ button::after {
 
 .box-out {
   background: #f8f8f8;
-  height: 200px;
+  height: 400rpx;
 }
 
 .flex-box {
   background: #ffffff;
-  box-shadow: 3px;
+  box-shadow: 6rpx;
   height: 80%;
   display: flex;
   flex-direction: column;
@@ -1030,8 +1157,8 @@ button::after {
 
 .sold-out {
   display: block;
-  width: 120px;
-  height: 120px;
+  width: 240rpx;
+  height: 240rpx;
   margin: 0 auto;
 }
 

src/pages/store/product/other.vue

@@ -29,7 +29,7 @@ import { debounce, merge } from "lodash-es";
 import { useDebounceFn } from '@vueuse/core';
 import dayjs from "dayjs";
 import { decodeBase64 } from "~/utils/http/helper";
-import { CDN_URL,CDM_URL } from "~/config/app";
+import { CDN_URL, CDM_URL } from "~/config/app";
 import { getRecommendList } from "~/apis/merchant";
 import type { DcProductModel } from "~/apis/model/dacang.model";
 
@@ -37,7 +37,11 @@ const discount_coupon_bg_220804Image = CDN_URL + '/static/assets/discount_coupon
 const productId = ref('')
 //推荐商品列表
 let skuInfo = reactive({
-  recommendList: []
+  recommendList: [],
+  totalPage: 0,
+  pageSize: 10,
+  status: '',
+  currentPage: 1
 })
 
 const userStore = useUserStore()
@@ -86,7 +90,7 @@ onShow(() => {
   isSubmit.value = false
 })
 
-//猜你喜欢
+//精品推荐
 function YouLike() {
   getRecommendList({
     page: 1,
@@ -104,7 +108,7 @@ function soldOut() {
   uni.setNavigationBarTitle({
     title: '商品下架不存在'
   })
-  YouLike()
+  loadList('reload')
   uni.hideLoading()
 }
 
@@ -485,8 +489,8 @@ function handleProductItemClick(
 }
 
 const outImg = computed(() => {
-  if(isShow){
-    return  CDM_URL+'/image/2023-11-24/20231124182002679.png'
+  if (isShow) {
+    return CDM_URL + '/image/2023-11-24/20231124182002679.png'
   }
 
 })
@@ -506,6 +510,56 @@ onPageScroll((page) => {
     headerClass.value = ''
   }
 })
+
+
+//列表加载
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  const params = {
+    page: skuInfo.currentPage,
+    limit: skuInfo.pageSize
+  }
+
+  if (action === 'reload') {
+    params.page = 1
+  }
+
+  getRecommendList({
+    ...params
+  }).then(res => {
+    if (action === 'page') {
+      skuInfo.recommendList = skuInfo.recommendList.concat(res.list)
+    }
+    if (action === 'reload') {
+      // state.list = state.list.concat(res.list)
+      skuInfo.recommendList = res.list
+    }
+    skuInfo.totalPage = Math.ceil(res.count / skuInfo.pageSize);
+    skuInfo.status = 'more'
+    if (callback) {
+      callback(res.list)
+    }
+  })
+}
+
+function handleScrollToLower() {
+  skuInfo.status = 'loading';
+  skuInfo.currentPage += 1;
+  // console.log(state.totalPage)
+  if (skuInfo.currentPage > skuInfo.totalPage) {
+    skuInfo.status = 'noMore';
+  } else {
+    setTimeout(() => {
+      loadList('page')
+    }, 300)
+  }
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+
 </script>
 <template>
   <CXBBasePage>
@@ -585,7 +639,7 @@ onPageScroll((page) => {
           <div
             class="before:content-[''] before:block before:absolute before:w-1 before:h-full before:bg-gradient-to-b from-red-500 to-red-600 before:rounded relative inline-block">
             <div class="pl-2">
-              猜你喜欢
+              精品推荐
             </div>
           </div>
         </div>
@@ -596,13 +650,20 @@ onPageScroll((page) => {
 
             </div>
           </grid-view>
+          <div class=" flex justify-center items-center text-[12px] text-gray-500">
+            <div v-if="skuInfo.status === 'loading'">
+              加载中...
+            </div>
+            <div v-if="skuInfo.status === 'noMore'">
+              没有更多了～
+            </div>
+          </div>
         </div>
 
       </div>
     </div>
-    
-  </CXBBasePage>
 
+  </CXBBasePage>
 </template>
 <style scoped>
 .box-out {

src/pages/user/address/index.vue

@@ -37,7 +37,7 @@
       <CXBEmpty text="您还没有收货地址" type="address" v-else/>
 
       <div class="fixed bottom-0 p-safe w-full bg-white ">
-        <div class="px-3">
+        <div class="p-3">
           <nut-button block type="primary" @click="handleCreateAddress">新建收货地址</nut-button>
         </div>
       </div>

src/pages/user/index.vue

@@ -199,9 +199,7 @@ function handleService(item: {
   })
 }
 
-// onShow(async () => {
-// await userStore.getUserInfo()
-// })
+
 
 function encodePhone(phone: string) {
   // let tel = '13600136000';
@@ -467,7 +465,7 @@ function handleShowMyRulePage() {
               <div class="text-xs">养老金</div>
             </div>
             <div @tap="handleShowMyInvitation" class="w-1/3  flex flex-col justify-center items-center">
-              <div>{{ agentInfo.brokerage_price ? agentInfo.brokerage_price : '0.00' }}</div>
+              <div>{{ agentInfo.brokerage_price}}</div>
               <div class="text-xs">我的佣金</div>
             </div>
             <div @tap="handleShowMyIntegral" class="w-1/3  flex flex-col justify-center items-center">
@@ -477,7 +475,7 @@ function handleShowMyRulePage() {
           </div>
           <div v-if="userStore.userInfo" class="flex">
             <div @click="handleToRedIntegral" class="w-1/2 flex flex-col justify-center items-center">
-              <div>{{ userStore.userInfo.red }}</div>
+              <div>{{ userStore.userInfo.member_brokerage_price}}</div>
               <div class="text-xs">红积分提现</div>
             </div>
             <div class="w-1/2 flex flex-col  justify-center items-center">

src/pages/user/login/index.vue

@@ -54,8 +54,10 @@ async function handleWexinLogin() {
         code: result.code,
         source: 'cxb'
       }).then(unionRes => {
-        // console.log(unionRes)
+        console.log(111111,unionRes)
         // const shareId = Cache.get('SHARE_ID')
+        //存储openid
+        // userStore.setOpenid(unionRes.openid)
         let redirectPageObj: {page: string, type: 'page' | 'tab'}
         if (Cache.get('SHARE_REDIRECT_PAGE')) {
           redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
@@ -66,19 +68,21 @@ async function handleWexinLogin() {
           // params = Object.assign({}, params, { shareId })
         // }
         wechatCheck(unionRes.unionid).then(checkRes => {
-          // console.log(checkRes)
+          
           userStore.login(checkRes.token, checkRes.exp)
           userStore.setUID(checkRes.user.uid)
           userStore.setUserInfo(checkRes.user)
           // console.log(checkRes)
           uni.hideLoading();
-
+          console.log('我存在吗111',redirectPageObj);
             uni.showToast({
               title: '登录成功'
             }).then(() => {
               setTimeout(() => {
-
+                console.log('我存在吗222',redirectPageObj);
+                
                 if (redirectPageObj) {
+                  console.log('我存在吗333',redirectPageObj);
                   if (redirectPageObj.type === 'page') {
                     return uni.redirectTo({
                       url: redirectPageObj.page
@@ -90,7 +94,7 @@ async function handleWexinLogin() {
                     })
                   }
                 } else {
-                  console.log(state.key);
+                  console.log('我是key>>>aaa',state.key);
                   
                   switch (state.key) {
                     case '10': {
@@ -107,7 +111,7 @@ async function handleWexinLogin() {
                     }
                     case '1': {
                       uni.switchTab({
-                        url: '/pages/order_addcart/order_addcart'
+                        url: '/pages/order_addcart/index'
                       })
                       break;
                     }

src/pages/user/login/other-phone.vue

@@ -1,33 +1,26 @@
 <template>
   <div>
-    <CXBBanner/>
+    <CXBBanner />
 
-    <nut-input
-        v-model="state.phone"
-        placeholder="请输入手机号"
-    >
+    <nut-input v-model="state.phone" placeholder="请输入手机号" type="number">
       <template #right>
         <nut-button type='primary' size="small" @click="handleGetCode" :loading="state.isAuthVerify">
-        {{ state.buttonText }}
-      </nut-button>
+          {{ state.buttonText }}
+        </nut-button>
       </template>
     </nut-input>
-    <nut-input
-        v-model="state.code"
-        placeholder="请输入验证码"
-        clearable
-    >
+    <nut-input v-model="state.code" placeholder="请输入验证码" clearable type="number">
     </nut-input>
 
     <div class="flex w-full">
       <div class="p-3 w-full">
         <nut-button type="primary" @click="handleLogin" block :disabled="!isFormVerify">登录</nut-button>
-<!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
-<!--          <div>-->
-<!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
-<!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
-<!--          </div>-->
-<!--        </div>-->
+        <!--        <div class="text-xs text-gray flex flex-col justify-center items-center p-3">-->
+        <!--          <div>-->
+        <!--            我已阅读并同意<span class="text-red text-xs" @click="handleViewXieyi(2)">《注册协议》</span>和<span-->
+        <!--              class="text-red text-xs" @click="handleViewXieyi(1)">《隐私协议》</span>-->
+        <!--          </div>-->
+        <!--        </div>-->
 
       </div>
 
@@ -38,8 +31,9 @@
 <script setup lang="ts">
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBBanner from "~/components/CXBBanner/CXBBanner.vue";
-import {authSmsLogin, authVerify} from "~/apis/auth.api";
+import { authSmsLogin, authVerify } from "~/apis/auth.api";
 import Cache from "~/utils/cache";
+import { getUserUnionId } from "~/apis/user";
 const userStore = useUserStore()
 
 const state = reactive({
@@ -104,8 +98,28 @@ function handleViewXieyi(type: number) {
 }
 
 function handleLogin() {
+  uni.showLoading({
+    title: '登录中'
+  });
   const shareId = Cache.get('SHARE_ID')
-
+  // uni.login({
+  //   provider: 'weixin',
+  //   univerifyStyle: {
+  //     fullScreen: true
+  //   },
+  //   success: result => {
+  //     // console.log(result)
+  //     getUserUnionId({
+  //       code: result.code,
+  //       source: 'cxb'
+  //     }).then(unionRes => {
+  //       console.log(111111, unionRes)
+  //       // const shareId = Cache.get('SHARE_ID')
+  //       //存储openid
+  //       userStore.setOpenid(unionRes.openid)
+  //     })
+  //   }
+  // })
   let params = {
     phone: state.phone,
     sms_code: state.code,
@@ -117,17 +131,18 @@ function handleLogin() {
   authSmsLogin({
     ...params
   }).then(authRes => {
-    console.log(authRes)
+    console.log(111111, authRes)
     userStore.login(authRes.token, authRes.exp)
     userStore.setUID(authRes.user.uid)
     userStore.setUserInfo(authRes.user)
+    uni.hideLoading();
     uni.showToast({
       title: '登录成功',
       icon: 'none'
     })
     Cache.clear('SHARE_ID')
     state.isAuthVerify = false
-    let redirectPageObj: {page: string, type: 'page' | 'tab'}
+    let redirectPageObj: { page: string, type: 'page' | 'tab' }
     if (Cache.get('SHARE_REDIRECT_PAGE')) {
       redirectPageObj = JSON.parse(Cache.get('SHARE_REDIRECT_PAGE'))
     }

src/pages/vip/index.vue

@@ -22,18 +22,21 @@
 
     <!--      <image :src="homeBanner" mode="widthFix" class="h-10 w-full "></image>-->
 
-    <div class="w-screen h-45">
+    <div class="w-screen h-32">
       <CXBBackTop :Scroll_X="Scroll_X" :isCss="1" />
-      <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="	aspectFit" />
-        </swiper-item>
-      </swiper>
+      <div class="px-3 h-32">
+        <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 rounded-md overflow-hidden ">
+          <swiper-item v-for="(item, index) in state.banners" :key="index">
+            <image :src="item.pic" class="w-full h-full object-cover" mode="aspectFill" />
+          </swiper-item>
+        </swiper>
+      </div>
     </div>
 
-    <div class="flex px-3">
+
+    <div class="flex px-3" v-if="state.type == 'user'">
       会员专区
     </div>
     <div class="px-3" v-if="list && list.length > 0">
@@ -99,7 +102,7 @@ import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FSearch from "~/components/FSearch/FSearch.vue";
 import { computed } from "vue";
 import type CXBBackTop from "~/components/CXBBackTop/CXBBackTop.vue";
-import { getVipAreaList } from "~/apis/merchant";
+import { getTypeProductList, getVipAreaList } from "~/apis/merchant";
 import { CDN_URL } from "~/config/app";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import { getHomeBanner, getProductShare } from "~/apis/common";
@@ -132,13 +135,20 @@ const state = reactive({
   interval: 5000,
   duration: 500,
   currents: "0",
+  title: '',
+  type: '',
 })
 const list = ref([])
 const count = ref()
 
 onLoad((option) => {
-  console.log(option.shareId);
 
+  state.type = option.type
+  if (state.type == 'user') {
+    state.title = '一壶茶会员中心'
+  } else if (state.type == 'gongchang') {
+    state.title = '工厂直供'
+  }
   if (option && option.shareId) {
     userStore.setShareId(option.shareId)
   }
@@ -154,10 +164,10 @@ onLoad((option) => {
     //   })
     // }
   })
-  userStore.setRedirectPage(`/pages/vip/index`, 'page')
+  userStore.setRedirectPage(`/pages/vip/index?type` + state.type, 'page')
 
-  getHomeBanner("user_banner").then(res => {
-    console.log("user_banner", res)
+  getHomeBanner(state.type + "_banner").then(res => {
+    console.log(state.type + "_banner>>", res)
     state.banners = res
   })
   loadList('reload')
@@ -204,35 +214,81 @@ onShareTimeline(() => {
 
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
-
-
-  // console.log(state.keyword)
-  const params = {
-    page: state.currentPage,
-    limit: state.pageSize
-  }
-  if (state.keyword) {
-    params.keyword = state.keyword
-  }
-  console.log('我是params', params)
-
-  getVipAreaList({
-    ...params
-  }).then(res => {
-    console.log(res.count)
-    // console.log(res.list)
-    count.value = res.count
-    console.log(action);
-    if (action === 'page') {
-      list.value = list.value.concat(res.list)
+  if (state.type == 'user') {
+    const params = {
+      page: state.currentPage,
+      limit: state.pageSize
+    }
+    if (state.keyword) {
+      params.keyword = state.keyword
     }
+    console.log('我是会员params>>', params)
+    getVipAreaList({
+      ...params
+    }).then(res => {
+      console.log(res.count)
+      // console.log(res.list)
+      count.value = res.count
+      console.log(action);
+      if (action === 'page') {
+        list.value = list.value.concat(res.list)
+      }
+      if (action === 'reload') {
+        list.value = res.list
+      }
+      if (callback) {
+        callback(res)
+      }
+    })
+  } else if (state.type == 'gongchang') {
     if (action === 'reload') {
-      list.value = res.list
+      state.currentPage = 1
+    }
+
+    const params = {
+      type: state.type,
+      page: state.currentPage,
+      limit: state.pageSize
     }
-    if (callback) {
-      callback(res)
+    if (state.keyword) {
+      params.keyword = state.keyword
     }
-  })
+    getTypeProductList({
+      ...params
+    }).then(res => {
+      if (res) {
+        if (action === 'reload') {
+          list.value = res.list
+        } else if (action === 'page') {
+          list.value = list.value.concat(res.list)
+        }
+        state.totalPage = Math.ceil(res.count / state.pageSize);
+        state.status = 'more'
+
+        if (callback) {
+          callback(res.list)
+        }
+      }
+    })
+
+  }
+  // getVipAreaList({
+  //   ...params
+  // }).then(res => {
+  //   console.log(res.count)
+  //   // console.log(res.list)
+  //   count.value = res.count
+  //   console.log(action);
+  //   if (action === 'page') {
+  //     list.value = list.value.concat(res.list)
+  //   }
+  //   if (action === 'reload') {
+  //     list.value = res.list
+  //   }
+  //   if (callback) {
+  //     callback(res)
+  //   }
+  // })
 }
 
 function handleItemClick(item) {
@@ -254,7 +310,7 @@ function handleScrollToLower() {
 }
 
 onReachBottom(() => {
-  // console.log('到底了。。。')
+  console.log('到底了。。。')
   handleScrollToLower()
 })
 
@@ -297,11 +353,17 @@ onPageScroll((page) => {
 })
 
 
+onShow(() => {
+  uni.setNavigationBarTitle({
+    title: state.title // 设置新的导航栏标题
+  });
+})
+
 </script>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 一壶茶会员中心
+  navigationBarTitleText: 储蓄保
   enablePullDownRefresh: true
 </route>
 <style>
@@ -311,4 +373,9 @@ page {
   --nut-searchbar-input-background: #f8f8f8;
   --nut-searchbar-input-box-shadow: none;
 }
+
+
+.box_y {
+  border-radius: 20rpx;
+}
 </style>

src/stores/dacangStore.ts

@@ -1,16 +1,13 @@
-import {defineStore} from "pinia";
+import { defineStore } from "pinia";
 
 export const useDacangStore = defineStore('dacangStore', {
     state: () => ({
-        currentClassify: '-1'
+        currentClassify: '-1',
     }),
     actions: {
         setClassify(classify: string) {
             // console.log('class' + classify)
             this.currentClassify = classify
-        },
-        loadList() {
-
-        }
+        },  
     }
 })

src/stores/userStore.ts

@@ -1,8 +1,8 @@
-import {defineStore} from "pinia";
-import {getUserInfo, getYanglaojinStatistics} from "~/apis/user";
+import { defineStore } from "pinia";
+import { getUserInfo, getYanglaojinStatistics } from "~/apis/user";
 import Cache from '~/utils/cache'
-import {LOGIN_STATUS, UID, USER_INFO} from "~/constants";
-import type {UserInfoModel} from "~/apis/model/userInfoModel";
+import { LOGIN_STATUS, SHARE_REDIRECT_PAGE, UID, USER_INFO,OPEN_ID } from "~/constants";
+import type { UserInfoModel } from "~/apis/model/userInfoModel";
 
 interface UserStoreState {
     userInfo: UserInfoModel
@@ -14,6 +14,7 @@ interface UserStoreState {
     yanglao: number,
     redirectPage: string | null,
     shareId: string | null
+    openid:string
 }
 
 export const useUserStore = defineStore('userStore', {
@@ -28,6 +29,7 @@ export const useUserStore = defineStore('userStore', {
         shareId: null,
         redirectPage: null,
         permissionList: null, // 权限列表
+        openid:Cache.get(OPEN_ID) || null
     }) as UserStoreState,
     actions: {
         // getYanglaojinStatistics().then(res => {
@@ -35,7 +37,7 @@ export const useUserStore = defineStore('userStore', {
         // })
         setRedirectPage(page: string, type: 'page' | 'tab') {
             this.redirectPage = page
-            Cache.set('SHARE_REDIRECT_PAGE', JSON.stringify({page, type}))
+            Cache.set('SHARE_REDIRECT_PAGE', JSON.stringify({ page, type }))
         },
         setShareId(shareId: string) {
             this.shareId = shareId
@@ -70,8 +72,12 @@ export const useUserStore = defineStore('userStore', {
             this.token = null
             this.uid = null
             this.userInfo = null
+            //清空登录信息
+            Cache.clear(USER_INFO);
+            Cache.clear(OPEN_ID);
             Cache.clear(LOGIN_STATUS)
             Cache.clear(UID)
+            Cache.clear(SHARE_REDIRECT_PAGE)
         },
         setUID(uid: string) {
             this.uid = uid
@@ -80,7 +86,13 @@ export const useUserStore = defineStore('userStore', {
         setUserInfo(userInfo: UserInfoModel) {
             this.userInfo = userInfo
             // 这个是存储的对象数据
-            Cache.set('USERINFO', userInfo)
+            Cache.set('USER_INFO', userInfo)
+            // Cache.set(USER_INFO, JSON.stringify(userInfo))
+        },
+        setOpenid(openid: string) {
+            this.openid = openid
+            // 这个是存储的对象数据
+            Cache.set('OPEN_ID', openid)
             // Cache.set(USER_INFO, JSON.stringify(userInfo))
         },
         setToken(token: string) {