feat: fix

README.md

@@ -127,4 +127,7 @@ pnpm build:mp-weixin
     - [x] 退出登录
 
 
-登录 退出 商品展示 、购买、收益
+登录 退出 商品展示 、购买、收益
+
+
+ciyid 要传，不然出现请选择正确地址异常

src/apis/user.ts

@@ -565,13 +565,34 @@ export function getUserYangLaoJin(): Promise<UserYanglaoJinModel> {
 }
 
 /**
+ * 获取养老金记录（线上/线下）
+ * @param params
+ */
+export function getUserYanglaoJinLog(params: {
+    page: number
+    limit: number
+    // 1 线下 0 线上
+    // source: '0' | '1'
+    source: string
+}): Promise<YanglaoLogXxResult> {
+    return defHttp.get({
+        url: API.GET_YANGLAO_LOG,
+        data: {
+            ...params
+        }
+    })
+}
+
+
+/**
  * 获取线下养老金记录
  */
 export function getUserYanglaoJinLogXx(params: {
     page: number
     limit: number
     // 1 线下 0 线上
-    source: '99'
+    // source: '0' | '1'
+    source: string
 }): Promise<YanglaoLogXxResult> {
     return defHttp.get({
         url: API.GET_YANGLAO_LOG

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -101,7 +101,7 @@ function handleCountChange(value) {
       v-model:show="showValue"
       @close="onCancel"
       position="bottom"
-      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-min-[60%] max-h-[80%]"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe min-h-[70%] max-h-[80%] h-full"
 
   >
     <div class="flex flex-col justify-between h-full">
@@ -114,7 +114,7 @@ function handleCountChange(value) {
             <div class="flex flex-col w-full">
 
               <div class="flex gap-2 justify-between w-full">
-                <div class="text-overflow text-xs flex-1" v-if="detail && detail.store_name">
+                <div class="text-overflow text-xs flex-1 line-clamp-2 h-fit" v-if="detail && detail.store_name">
                   {{ detail.store_name }}
                 </div>
                 <div
@@ -155,7 +155,7 @@ function handleCountChange(value) {
               >
                 <div
                     v-if="item.sku && item.sku !== ''"
-                    class="text-[12px] border border-solid rounded p-1 px-2 "
+                    class="text-[11px] border border-solid rounded p-1 px-1 "
                     :class="currentSku.unique === item.unique ? 'border-primary text-primary' : 'border-gray-500 text-gray-500'"
                 >
                   {{ item.sku }}

src/components/CXBYaojinTag/CXBYaojinTag.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const props = defineProps({
   amount: {
-    type: Number,
+    type: String,
     required: true
   }
 })
@@ -9,7 +9,7 @@ const props = defineProps({
 <template>
   <div class="border border-solid border-1 border-red rounded flex text-auto items-center text-[#FE0032] w-fit h-4">
     <image src="https://cdn.bjtdba.com/vod/image/2023-09-15/20230915160858609.png"
-           mode="widthFix" class="!w-7"></image>
+           mode="widthFix" class="!w-7 h-4"></image>
     <div class="px-2 flex items-center jusitify-center text-[11px]">
       <div>
         养老金 ¥{{ amount }}

src/pages/immediate-withdrawal/index.vue

@@ -42,9 +42,7 @@ watch(() => cashWithdrawalAmount.value, (val) => {
     getWithdrawalService({
       money: val
     }).then(res => {
-      // console.log(res)
       withdrawalCal.value = res
-      console.log(res)
     })
   } else {
     isDisabled.value = true
@@ -52,7 +50,7 @@ watch(() => cashWithdrawalAmount.value, (val) => {
   }
 })
 function handleInputAll() {
-  console.log(userSpreadInfo.value?.brokerage_price)
+  // console.log(userSpreadInfo.value?.brokerage_price)
   if (userSpreadInfo.value && userSpreadInfo.value.brokerage_price && Number.parseFloat(userSpreadInfo.value?.brokerage_price) >= 100 ) {
     cashWithdrawalAmount.value = userSpreadInfo.value.brokerage_price
   } else {
@@ -69,7 +67,6 @@ function handleImmediateWithdrawal() {
   if (isDisabled.value) {
     return
   }
-  console.log(yanglaojin.value)
   // 1 判断是否需要实名
   if (!yanglaojin.value?.is_certification == 1) {
     return uni.navigateTo({
@@ -92,7 +89,7 @@ function handleImmediateWithdrawal() {
       icon: 'none'
     })
   }
-  if (cashWithdrawalAmount.value > userSpreadInfo.value?.brokerage_price ) {
+  if (Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userSpreadInfo.value?.brokerage_price) ) {
     isDisabled.value = true
     return uni.showToast({
       title: '输入金额超过可提现余额',

src/pages/my-integral/index.vue

@@ -28,7 +28,7 @@ function loadSignInInfo() {
     console.log(res)
     const {today, day} = res
     state.signToday = day
-    if (today === 0) {
+    if (today == 0) {
       state.isShowSignIn = true
     }
     // // if (today === 0) {

src/pages/my-integral/user-invation.vue

@@ -123,8 +123,9 @@ function shareImage() {
 }
 </script>
 <template>
-    <div class="relative top-0 left-0 min-h-screen h-full w-screen bg-[#FFCB75] z-0 ">
-      <image :src="invite_friends_bg" mode="widthFix" class="w-full h-full absolute"></image>
+<!--      <image :src="invite_friends_bg" mode="widthFix" class="w-screen h-full absolute"></image>-->
+  <div class="w-screen overflow-x-hidden  h-full">
+    <div class="invite_friends_bg relative  top-0 left-0">
       <image
           @click="handleShowAgreement(17)"
           :src="huodongshuomingImg" mode="widthFix" class="w-10 absolute top-0 right-3"></image>
@@ -134,136 +135,148 @@ function shareImage() {
         邀请码
       </div>
 
-      <nut-dialog title="邀请码"  v-model:visible="showDialog" @cancel="onCancel" @ok="onOk" >
-        <template>
-          <input v-model="inviteCode" class="border border-solid border-1px rounded h-10" placeholder="请输入推荐人邀请码"/>
-        </template>
-      </nut-dialog>
-
-      <div class="relative top-120 text-white flex flex-col items-center justify-center pb-30">
-        <div class=" w-full h-10 relative flex justify-center items-center">
-          <div class="relative w-60 text-center z-1 h-10 absolute top-2">
-            立即邀请
-          </div>
-          <image :src="buttonImg" mode="widthFix" class="w-60 h-10 absolute top-0"></image>
+    </div>
+    <div class="relative  text-white flex flex-col items-center justify-center pb-30">
+      <div class="button_bg flex flex-col items-center" @tap.stop="shareImage">
+        <div class="flex pt-3.5">
+          立即邀请
         </div>
-        <div class="text-primary text-[12px] relative py-3">我的邀请码：{{ userStore && userStore.userInfo && userStore.userInfo.user_number }}</div>
-        <div class="relative w-full flex items-center">
-          <div class="w-full px-3 flex justify-center items-center  text-gray-600 text-[12px]">
-            <div class="integral_bg">
-              <div class="pt-20 flex flex-col gap-3 px-5 h-48 ">
-                <div class="bg-[#ffedc6] flex justify-around items-center flex-1 ">
-                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center gap-2">
-                    <div>首次邀请好友</div>
-                    <div class="flex gap-1  ">
-                      <text>奖励<text class="text-primary text-xl font-bold">99</text>积分</text>
-                    </div>
+      </div>
+      <div class="text-primary text-[12px] relative pb-3">我的邀请码：{{ userStore && userStore.userInfo && userStore.userInfo.user_number }}</div>
+      <div class="relative  flex items-center">
+        <div class=" px-3 flex justify-center items-center  text-gray-600 text-[12px]">
+          <div class="integral_bg">
+            <div class="pt-20 flex flex-col gap-3 px-5 h-48 ">
+              <div class="bg-[#ffedc6] flex justify-around items-center flex-1 ">
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center gap-2">
+                  <div>首次邀请好友</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">99</text>积分</text>
                   </div>
-                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                    <div>好友首次获得养老金</div>
-                    <div class="flex gap-1  ">
-                      <text>奖励<text class="text-primary text-xl font-bold">350</text>积分</text>
-                    </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友首次获得养老金</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">350</text>积分</text>
                   </div>
                 </div>
+              </div>
 
-                <div class="bg-[#ffedc6] flex justify-around items-center flex-1">
-                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                    <div>好友签到3天</div>
-                    <div class="flex gap-1  ">
-                      <text>奖励<text class="text-primary text-xl font-bold">50</text>积分</text>
-                    </div>
+              <div class="bg-[#ffedc6] flex justify-around items-center flex-1">
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到3天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">50</text>积分</text>
                   </div>
-                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                    <div>好友签到14天</div>
-                    <div class="flex gap-1  ">
-                      <text>奖励<text class="text-primary text-xl font-bold">100</text>积分</text>
-                    </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到14天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">100</text>积分</text>
                   </div>
-                  <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
-                  <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
-                    <div>好友签到30天</div>
-                    <div class="flex gap-1  ">
-                      <text>奖励<text class="text-primary text-xl font-bold">300</text>积分</text>
-                    </div>
+                </div>
+                <div class="bg-[#FFCB75] h-8 w-0.3 opacity-50"></div>
+                <div class="divide-y-[3px] w-1/2 flex flex-col justify-center items-center py-3 gap-2">
+                  <div>好友签到30天</div>
+                  <div class="flex gap-1  ">
+                    <text>奖励<text class="text-primary text-xl font-bold">300</text>积分</text>
                   </div>
                 </div>
-
               </div>
 
             </div>
 
-
-            <!--          <image :src="integral_bg" mode="widthFix" class="w-full h-full relative"></image>-->
-
           </div>
+
         </div>
-        <div class="relative w-full">
-          <div class="px-4">
-            <div class="bg-[#F8F8F8] rounded-lg h-60 text-gray-500">
-              <div class="bg-[#FDF5E8] rounded-t-lg flex items-center justify-center py-2">
-                <image :src="goodFriendImg" mode="widthFix" class="w-50"></image>
-              </div>
-              <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList && invitePartnerModel.userInviteVoList.list.length > 0">
-                <swiper autoplay vertical :circular="true" :display-multiple-items="4" class="w-auto h-46">
-                  <swiper-item  v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index" class="w-auto text-[12px] h-auto">
-                    <div class="p-3 h-30 flex justify-between  f-hairline-bottom">
-                      <div class="flex gap-2">
-                        <image :src="item.avatar" mode="widthFix" class="w-8 h-8"></image>
-                        <div class="flex flex-col">
-                          <div class="font-bold">{{ item.nickname }}</div>
-                          <div>{{ encodePhone( item.phone ) }}</div>
-                        </div>
+      </div>
+      <div class="relative w-full mt-3">
+        <div class="px-4">
+          <div class="bg-[#F8F8F8] rounded-lg h-60 text-gray-500">
+            <div class="bg-[#FDF5E8] rounded-t-lg flex items-center justify-center py-2">
+              <image :src="goodFriendImg" mode="widthFix" class="w-50"></image>
+            </div>
+            <div v-if="invitePartnerModel && invitePartnerModel.userInviteVoList && invitePartnerModel.userInviteVoList.list.length > 0">
+              <swiper autoplay vertical :circular="true" :display-multiple-items="4" class="w-auto h-46">
+                <swiper-item  v-for="(item, index) in invitePartnerModel.userInviteVoList.list" :key="index" class="w-auto text-[12px] h-auto">
+                  <div class="p-3 h-30 flex justify-between  f-hairline-bottom">
+                    <div class="flex gap-2">
+                      <image :src="item.avatar" mode="widthFix" class="w-8 h-8"></image>
+                      <div class="flex flex-col">
+                        <div class="font-bold">{{ item.nickname }}</div>
+                        <div>{{ encodePhone( item.phone ) }}</div>
                       </div>
+                    </div>
 
-                      <div class="text-gray">{{ item.promoterTime }}</div>
+                    <div class="text-gray">{{ item.promoterTime }}</div>
 
 
-                    </div>
-                  </swiper-item>
-                </swiper>
-              </div>
-
-              <div v-else class="flex justify-center items-center text-[12px] text-gray h-48">
-                竟然没有好友
-              </div>
+                  </div>
+                </swiper-item>
+              </swiper>
             </div>
 
+            <div v-else class="flex justify-center items-center text-[12px] text-gray h-48">
+              竟然没有好友
+            </div>
           </div>
 
         </div>
-        <div class="relative w-full text-[12px] py-5 text-black flex justify-center items-center">
-          <div class="flex gap-4">
-            <div
-                @click="shareImage"
-                class="flex flex-col justify-center items-center gap-3">
-              <image :src="wexinLogo" mode="widthFix" class="w-10 h-10"></image>
-              <div>微信</div>
-            </div>
-            <div
-                @click="handleShowCode"
-                class="flex flex-col justify-center items-center gap-3">
-              <image :src="smLogo" mode="widthFix" class="w-10 h-10"></image>
-              <div>面对面扫码</div>
-            </div>
+
+      </div>
+      <div class="relative w-full text-[12px] py-5 text-black flex justify-center items-center">
+        <div class="flex gap-4">
+          <div
+              @click="shareImage"
+              class="flex flex-col justify-center items-center gap-3">
+            <image :src="wexinLogo" mode="widthFix" class="w-10 h-10"></image>
+            <div>微信</div>
+          </div>
+          <div
+              @click="handleShowCode"
+              class="flex flex-col justify-center items-center gap-3">
+            <image :src="smLogo" mode="widthFix" class="w-10 h-10"></image>
+            <div>面对面扫码</div>
           </div>
         </div>
       </div>
-
     </div>
 
+    <nut-dialog title="邀请码"  v-model:visible="showDialog" @cancel="onCancel" @ok="onOk" >
+      <template>
+        <input v-model="inviteCode" class="border border-solid border-1px rounded h-10" placeholder="请输入推荐人邀请码"/>
+      </template>
+    </nut-dialog>
+  </div>
+
 </template>
 
 <style>
+.invite_friends_bg {
+  overflow: hidden;
+  width: 750rpx;
+  height: 994rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/invite_friends_bg_220826.png');
+  background-size: 100% 100%;
+}
 .integral_bg {
+  overflow: hidden;
   width: 710rpx;
   height: 591rpx;
   background-image: url('https://cdn.bjtdba.com/vod/image/2023-09-18/20230918140610841.png');
   background-size: 100% 100%;
 }
+.button_bg {
+  width: 630rpx;
+  height: 124rpx;
+  background-image: url('https://cdn.bjtdba.com/chuxubao/static/assets/invitation_button_220826.png');
+  background-size: 100% 100%;
+
+}
 page {
+  overflow-x: hidden;
   background: #ffcb75;
 }
 

src/pages/order-confirm/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {getUserAddressDetail, getUserAddressList, getUserVipInfo} from "~/apis/user";
 import {reactive} from "vue";
-import {checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate} from "~/apis/order.api";
+import {cartChange, checkProductDaCang, CreateOrderRequest, orderCheck, orderCreate} from "~/apis/order.api";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import FPrice from "~/components/FPrice/FPrice.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
@@ -44,6 +44,8 @@ onLoad(async (options) => {
   if (options && options.product_id) {
     data.productId = options.product_id
   }
+
+  console.log(data)
   // if (options && options.addressId) {
   //   // getUserAddressDetail(options.addressId).then(res => {
   //   //   data.addressInfo = res
@@ -77,6 +79,10 @@ onLoad(async (options) => {
   //   console.log(res)
   // })
   /// 获取订单商品数据
+  uni.showLoading({
+    title: '数据加载中',
+    icon: 'none'
+  })
   orderCheck({
     cart_id: data.cartId.split(','),
     address_id: data.addressId
@@ -87,7 +93,10 @@ onLoad(async (options) => {
     data.totalPrice = res.order_price
     data.orderStatus = res.status
     // data.proPrice = res.proPrice
+    uni.hideLoading()
+
   }).catch(error => {
+    uni.hideLoading()
     console.log(error + '----')
     uni.showToast({
       title: error,
@@ -182,9 +191,58 @@ function handleAddressSelect() {
     url: '/pages/user/address/index?from=order'
   })
 }
+function handleNumberChange(num, goodItem) {
+  console.log(goodItem)
+  uni.showLoading()
+  console.log(num)
+  cartChange(goodItem.cart_id, num).then(res => {
+    reTotal()
+    uni.hideLoading()
+  })
+}
+
+function reTotal() {
+  orderCheck({
+    cart_id: data.cartId.split(','),
+    address_id: data.addressId
+  }).then(res => {
+    console.log(res)
+    data.is_dacang_vip_product = res.is_dacang_vip_product
+    data.cartOrder = res.order
+    data.totalPrice = res.order_price
+    data.orderStatus = res.status
+    // data.proPrice = res.proPrice
+    uni.hideLoading()
+
+  }).catch(error => {
+    uni.hideLoading()
+    console.log(error + '----')
+    uni.showToast({
+      title: error,
+      icon: 'none'
+    })
+  })
+  // let allArr = []
+  // let totalMoney = 0
+  // let totalNum = 0
+
+  // shopping.value?.list.forEach((goods, index) => {
+  //   // 总金额｜总数
+  //   goods.list.forEach(goodItem => {
+  //     if (goodItem.check) {
+  //       totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+  //       totalNum += Number.parseFloat(goodItem.cart_num)
+  //       // state.cart_id.push(goodItem.cart_id)
+  //     }
+  //   })
+  // })
+  //
+  // // isAllSelect.value = allArr.length === shopping.value?.list.length
+  // // state.totalCartCount = totalNum
+  // state.totalPrice = totalMoney
+}
 </script>
 <template>
-  <CXBBasePage>
     <div class="p-3 flex flex-col gap-3 pb-safe">
       <div
           @click="handleAddressSelect"
@@ -197,7 +255,7 @@ function handleAddressSelect() {
                   <image :src="addressIcon" mode="aspectFit" class="w-4 h-4"></image>
                 </div>
                 <div class="flex-1 flex">
-                  {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district }}
+                  {{ data.addressInfo.province + ' ' + data.addressInfo.city + ' ' + data.addressInfo.district + ' ' + data.addressInfo.detail }}
                 </div>
               </div>
 
@@ -217,7 +275,7 @@ function handleAddressSelect() {
         </div>
       </div>
 
-      <div class="pb-10">
+      <div class="pb-15">
         <div v-for="(item, index) in data.cartOrder" :key="index"
              class=" bg-white rounded"
         >
@@ -234,42 +292,50 @@ function handleAddressSelect() {
 
               </div>
               <div class="flex flex-col ">
-                <div class="flex flex-col text-sm">
-                  {{ orderProductItem.product.store_name }}
+                <div class="flex flex-col ">
+                  <div class="line-clamp-2 text-xs">
+                    {{ orderProductItem.product.store_name }}
+                  </div>
                   <div class="text-[11px] text-gray-500">{{ orderProductItem.productAttr.sku }}</div>
                 </div>
-                <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
-                <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"></FPrice>
-                <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
+                <div class="flex">
+                  <CXBYaojinTag :amount="orderProductItem.yanglao" v-if="item.mer_id != '148'"/>
 
+                </div>
+                <div class="flex justify-between">
+                  <FPrice :price="orderProductItem.productAttr.price" v-if="item.mer_id != '148'"></FPrice>
+                  <FPrice :price="orderProductItem.productAttr.price * 30" v-if="item.mer_id == '148'"></FPrice>
+                  <nut-input-number v-model="orderProductItem.cart_num" @change="(num) => handleNumberChange(num, orderProductItem)"/>
+
+                </div>
               </div>
 
             </div>
 
-            <div>
-              <FCell
-                  v-if="item.mer_id != '148'"
-                  title="优惠劵"
-                  :value="item.order.coupon_price ? item.order.coupon_price : '暂无优惠券'"
-                  arrow
-              ></FCell>
-              <FCell
-                  v-if="item.mer_id == '148'"
-                  title="积分"
-                  :value="userStore.userInfo.score ? userStore.userInfo.score : '暂无积分'"
-                  arrow
-              ></FCell>
-              <FCell
-                  title="运费"
-                  :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
-                  arrow
-              ></FCell>
-              <FCell
-                  title="留言"
-                  value="建议留言前先与商家沟通确认"
-                  arrow
-              ></FCell>
-            </div>
+          </div>
+          <div>
+            <FCell
+                v-if="item.mer_id != '148'"
+                title="优惠劵"
+                :value="item.order.coupon_price ? item.order.coupon_price : '暂无优惠券'"
+                arrow
+            ></FCell>
+            <FCell
+                v-if="item.mer_id == '148'"
+                title="积分"
+                :value="userStore.userInfo.score ? userStore.userInfo.score : '暂无积分'"
+                arrow
+            ></FCell>
+            <FCell
+                title="运费"
+                :value="item.order.postage_price > 0 ? item.order.postage_price : '免运费'"
+                arrow
+            ></FCell>
+            <FCell
+                title="留言"
+                value="建议留言前先与商家沟通确认"
+                arrow
+            ></FCell>
           </div>
 
         </div>
@@ -284,15 +350,20 @@ function handleAddressSelect() {
          <FPrice  v-else :price="data.totalPrice"></FPrice>
         </div>
         <div class="flex">
-          <nut-button type="primary" size="small" @click="handleSubmit">提交订单</nut-button>
+          <nut-button type="primary" @click="handleSubmit">提交订单</nut-button>
         </div>
       </div>
 
     </div>
-  </CXBBasePage>
 </template>
 
 <route lang="yaml">
 style:
   navigationBarTitleText: 提交订单
-</route>
+</route>
+
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/order/components/AllItemList.vue

@@ -4,6 +4,12 @@ import OrderItem from "~/pages/order/components/OrderItem.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 
+const props = defineProps({
+  tabValue: {
+    type: Number,
+    default: 0
+  }
+})
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
@@ -78,6 +84,13 @@ function handleScrollToLower() {
 // })
 onMounted(() => {
   loadList('reload')
+  uni.$on('orderCancelFromList', () => {
+    // loadAllOrderList()
+    loadList('reload')
+    // state.tabvalue = 0
+  })
+
+
   uni.$on('onTab0ReachBottom', () => {
     console.log('alll...')
     handleScrollToLower()

src/pages/order/components/ObligationOrderList.vue

@@ -4,7 +4,12 @@ import OrderItem from "~/pages/order/components/OrderItem.vue";
 import OtherOrderItem from "~/pages/order/components/OtherOrderItem.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import OrderObligationItem from "~/pages/order/components/OrderObligationItem.vue";
-
+const props = defineProps({
+  tabValue: {
+    type: Number,
+    default: 0
+  }
+})
 const state = reactive({
   currentPage: 1,
   pageSize: 10,
@@ -60,6 +65,13 @@ function handleScrollToLower() {
 
 onMounted(() => {
   loadList('reload')
+  uni.$on('orderCancelFromList', () => {
+    // loadAllOrderList()
+    loadList('reload')
+    // uni.$emit('orderCancelFromList', 1)
+    // state.tabvalue = 0
+  })
+
   uni.$on('onTab1ReachBottom', handleScrollToLower)
   uni.$on('onTab1PullDownRefresh', () => {
     loadList('reload', items => {

src/pages/order/components/OrderItem.vue

@@ -18,7 +18,12 @@ const props = defineProps({
   },
   status: {
     type: Number,
+  },
+  tabValue: {
+    type: Number,
+    default: 0
   }
+
 })
 
 // function detailOrderList(p) {}
@@ -83,7 +88,8 @@ function handleCancelOrder() {
         icon: 'none'
       })
 
-      uni.$emit('orderCancelFromList')
+      // if (props.tabValue)
+      uni.$emit('orderCancelFromList', props.tabValue)
 
     }, 300)
 
@@ -161,7 +167,7 @@ function handleProductItemClick(
   //     url: `${otherDetailUrl}?params=${params}`
   //   })
   // }
-  console.log(item)
+  // console.log(item)
   // 大仓
   uni.navigateTo({
     url: `/pages/store/product/detail?id=${item.orderProduct[0].product_id}`
@@ -186,7 +192,7 @@ function handleShowObligationOrderDetail(orderItem) {
 <template>
   <div class="mb-3 bg-white rounded p-3">
     <div
-        @click.stop="handleHeaderClick"
+        @stop.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">
@@ -280,7 +286,7 @@ function handleShowObligationOrderDetail(orderItem) {
 
           </div>
           <div class="flex justify-end gap-2" v-if="orderItem.status == 5">
-            <nut-button size="small" type="default" @click="handleCancelOrder"><div class="text-black">取消订单</div></nut-button>
+            <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>

src/pages/order/components/OrderObligationItem.vue

@@ -222,7 +222,8 @@ function handleShowObligationOrderDetail(orderItem) {
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+<!--                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>-->
+                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 

src/pages/order/detail.vue

@@ -142,9 +142,26 @@ const payType = computed(() => {
     return '积分兑换'
   }
 })
+
+function handleProductItemClick(
+    item
+) {
+  // function navigateToDetail(params) {
+  //   let otherDetailUrl = `/pages/store/product/other`
+  //   return uni.navigateTo({
+  //     url: `${otherDetailUrl}?params=${params}`
+  //   })
+  // }
+  console.log(item.product_id)
+  // 大仓
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${item.product_id}`
+  })
+}
+
+
 </script>
 <template>
-  <CXBBasePage>
     <div class="p-3 flex flex-col gap-3 pb-safe text-[12px]" v-if="detail">
       <div
           class="rounded bg-white p-3 flex">
@@ -190,7 +207,7 @@ const payType = computed(() => {
             </div>
             <div class="flex flex-col w-full">
               <div class="flex flex-col text-sm ">
-                <div class="flex justify-between">
+                <div class="flex justify-between" @tap.stop="handleProductItemClick(productItem)">
                   <div class="flex">
                     {{ productItem.cart_info.product.store_name }}
                   </div>
@@ -290,7 +307,6 @@ const payType = computed(() => {
 
       </div>
     </div>
-  </CXBBasePage>
 </template>
 
 <route lang="yaml">

src/pages/order/index.vue

@@ -14,7 +14,7 @@
     </div>
 
     <div class="mt-12">
-      <AllItemList v-if="state.tabvalue == 0"/>
+      <AllItemList v-if="state.tabvalue == 0" :tab-value="0"/>
       <ObligationOrderList v-if="state.tabvalue == 1"/>
       <Order2List v-if="state.tabvalue == 2" :status="'0'"/>
       <Order3List v-if="state.tabvalue == 3" :status="'1'"/>
@@ -84,20 +84,22 @@ onLoad(options => {
   // })
 })
 
-uni.$on('orderCancelFromList', () => {
-  // loadAllOrderList()
-  state.tabvalue = 0
-})
-
-uni.$on('orderTakeFromList', () => {
-  // loadAllOrderList()
-  state.tabvalue = 3
-})
+// uni.$on('orderCancelFromList', (tabValue) => {
+//   if (!tabValue) {
+//     state.tabvalue = 0
+//   } else {
+//     state.tabvalue = tabValue
+//   }
+//   // loadAllOrderList()
+// })
 
-uni.$on('orderComment', () => {
-  // loadAllOrderList()
-  state.tabvalue = 4
-})
+// uni.$on('orderTakeFromList', () => {
+//   state.tabvalue = 3
+// })
+//
+// uni.$on('orderComment', () => {
+//   state.tabvalue = 4
+// })
 
 onReachBottom(() => {
   // handleScrollToLower()

src/pages/order/logistics.vue

@@ -129,6 +129,12 @@ function handleClipboard() {
     }
   })
 }
+
+function handleMakePhoneCall() {
+  uni.makePhoneCall({
+    phoneNumber: state.orderDetail.user_phone
+  })
+}
 </script>
 
 <template>
@@ -154,6 +160,7 @@ function handleClipboard() {
                 复制
               </div>
               <div
+                  @tap="handleMakePhoneCall"
                   class="flex items-center border border-solid border-gray-200 text-[12px] rounded min-w-6 text-center  max-w-fit px-2 bg-white"
               >
                 电话

src/pages/order/obligation-detail.vue

@@ -22,6 +22,7 @@ onLoad((options) => {
   // console.log(options.detail)
   if (options.detail) {
     detail.value = JSON.parse(decodeBase64(options.detail))
+    console.log(detail.value)
   // detail.value = JSON.parse(decodeBase64(base64Json))
   }
 })
@@ -199,7 +200,7 @@ const payType = computed(() => {
               </div>
 
               <div class="flex flex-col justify-center items-center">
-                <FPrice :price="orderProduct.cart_info.product.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
+                <FPrice :price="orderProduct.cart_info.productAttr.price" ex-class="font-bold text-[12px] !text-[#000]"></FPrice>
                 <div class="text-gray-500 text-[11px]">共{{ orderProduct.product_num }}件</div>
               </div>
 

src/pages/order/test.json

@@ -1,21 +1,199 @@
 {
   "status": 200,
-  "message": "添加成功",
+  "message": "success",
   "data": {
-    "address_id": "315",
-    "real_name": "TTT",
-    "phone": "13488689885",
-    "province": "重庆",
-    "city": "重庆郊县",
-    "city_id": "2",
-    "district": "奉节县",
-    "village": "",
-    "village_id": "",
-    "detail": "1111",
-    "post_code": "",
-    "is_default": "0",
-    "code_list": "2,69000,69124,71653",
-    "uid": "395",
-    "create_time": "2023-09-22 21:53:45"
+    "express": [
+      {
+        "time": "2023-09-20 19:06:01",
+        "status": "【廊坊市】 您的快递已签收，签收人在【廊坊三河燕郊四季花都店】取件。如有疑问请联系业务员：15103369570，代理点电话：18133879513，投诉电话：0316-6840606。感谢使用中通快递，期待再次为您服务！"
+      },
+      {
+        "time": "2023-09-20 11:59:15",
+        "status": "【廊坊市】 快件已在 快递超市 的【廊坊三河燕郊四季花都店】暂放，【取件地址：四季花都一期底商华联超市里】，请及时取件。如有疑问请联系业务员：15103369570，代理点电话：18133879513，投诉电话：0316-6840606"
+      },
+      {
+        "time": "2023-09-20 08:22:21",
+        "status": "【廊坊市】东燕郊 的业务员【5区承包区王田祥,15103369570】正在第2次派件（95720为中通快递员外呼专属号码，请放心接听，如有问题可联系网点:0316-6840606,投诉电话:0316-6840606）"
+      },
+      {
+        "time": "2023-09-20 03:03:24",
+        "status": "【廊坊市】 快件已到达 东燕郊"
+      },
+      {
+        "time": "2023-09-19 14:46:55",
+        "status": "【保定市】 快件已发往 东燕郊"
+      },
+      {
+        "time": "2023-09-19 14:38:48",
+        "status": "【保定市】 快件已到达 京南转运中心"
+      },
+      {
+        "time": "2023-09-18 08:13:02",
+        "status": "【广州市】 快件已发往 京南转运中心"
+      },
+      {
+        "time": "2023-09-18 08:09:19",
+        "status": "【广州市】 快件已到达 广州中心"
+      },
+      {
+        "time": "2023-09-18 04:00:18",
+        "status": "【广州市】 快件已发往 京南转运中心"
+      },
+      {
+        "time": "2023-09-17 23:07:14",
+        "status": "【广州市】 广州夏茅（020-22505305）陈美玲（15397525882） 已揽收"
+      }
+    ],
+    "order": {
+      "order_id": "4265",
+      "group_order_id": "4659",
+      "order_sn": "wx1695261950701957251",
+      "uid": "10753",
+      "real_name": "测试",
+      "user_phone": "18513112593",
+      "user_address": "北京顺义区光明街道 测试",
+      "user_address_ids": "1,35,493,0",
+      "area_manage_address_ids": "",
+      "cart_id": "11517",
+      "total_num": "1",
+      "total_price": "600.00",
+      "total_postage": "10.00",
+      "pay_price": "610.00",
+      "pay_postage": "10.00",
+      "extension_one": "59.64",
+      "extension_two": "0.00",
+      "commission_rate": "2.0000",
+      "coupon_id": "",
+      "coupon_price": "0.00",
+      "order_type": "0",
+      "paid": "1",
+      "pay_time": "2023-09-21 10:31:32",
+      "pay_type": "5",
+      "create_time": "2023-09-21 10:05:51",
+      "status": "1",
+      "delivery_type": "1",
+      "delivery_name": "中通快递",
+      "delivery_id": "78367406471357",
+      "mark": "",
+      "remark": null,
+      "admin_mark": null,
+      "verify_code": null,
+      "verify_time": null,
+      "verify_service_id": "0",
+      "mer_id": "465",
+      "reconciliation_id": "0",
+      "cost": "300.00",
+      "is_del": "0",
+      "is_system_del": "0",
+      "remind": "0",
+      "remind_time": null,
+      "gzc": "0",
+      "trade_no": "",
+      "channel_trade_no": "",
+      "alipay_no": "",
+      "weixin_no": "",
+      "table_id": "0",
+      "mer_money": "549.00",
+      "last_status": null,
+      "share_id": "0",
+      "pay_mer_id": null,
+      "is_split_to_tomorrow": "0",
+      "service_money": "361.00",
+      "test_order": "0",
+      "dacang_id": "0",
+      "distribution_mode": "0",
+      "da_cang_profit": "0.00",
+      "recommended_merchants": "0.00",
+      "mer_fanyong": "61.00",
+      "is_dacang": "0",
+      "cost_price": null,
+      "douhuomall": null,
+      "douhuomall_status": null,
+      "douhuomall_msg": null,
+      "address_id": "289",
+      "douhuomall_order_no": null,
+      "supply_type": null,
+      "seckill": "0",
+      "orderProduct": [
+        {
+          "order_product_id": "4535",
+          "order_id": "4265",
+          "uid": "10753",
+          "cart_id": "11517",
+          "product_id": "6101",
+          "extension_one": "0.00",
+          "extension_two": "0.00",
+          "product_sku": "4fdae5562b10",
+          "is_refund": "0",
+          "product_num": "1",
+          "refund_num": "1",
+          "is_reply": "0",
+          "product_price": "600.00",
+          "cart_info": {
+            "product": {
+              "product_id": "6101",
+              "image": "https:\/\/cdn.bjtdba.com\/chuxubao\/images\/2023-09-04\/782c3202309041605416214.png",
+              "store_name": "头层牛皮女粗高跟骑士靴2023年秋冬款绑带休闲靴薄绒长筒靴女",
+              "is_show": "1",
+              "status": "1",
+              "is_del": "0",
+              "unit_name": "双",
+              "price": "500.00",
+              "mer_status": "1",
+              "temp_id": "257",
+              "give_coupon_ids": [],
+              "is_gift_bag": "0",
+              "is_used": "1",
+              "product_type": "0",
+              "old_product_id": "0",
+              "temp": {
+                "shipping_template_id": "257",
+                "name": "有运费的模板",
+                "type": "0",
+                "appoint": "0",
+                "undelivery": "0",
+                "mer_id": "465",
+                "is_default": "0",
+                "sort": "10",
+                "create_time": "2023-09-09 09:22:39",
+                "regionAddress": {
+                  "shipping_template_region_id": "609",
+                  "temp_id": "257",
+                  "city_id": "0",
+                  "first": "1.00",
+                  "first_price": "10.00",
+                  "continue": "1.00",
+                  "continue_price": "5.00"
+                },
+                "undelives": null,
+                "freeAddress": null
+              }
+            },
+            "productAttr": {
+              "gong_mer_profit": null,
+              "gong_pension": null,
+              "gong_market_price": null,
+              "cost_price": null,
+              "product_id": "6101",
+              "stock": "7",
+              "price": "600.00",
+              "unique": "4fdae5562b10",
+              "sku": "黄,36",
+              "volume": "0.00",
+              "weight": "0.00",
+              "ot_price": "8000.00",
+              "dacang_price": "0.00",
+              "cost": "300.00",
+              "bc_extension_one": 0,
+              "bc_extension_two": 0,
+              "seckill": 0
+            },
+            "product_type": "0"
+          },
+          "create_time": "2023-09-21 10:05:50",
+          "type": "1"
+        }
+      ]
+    }
   }
 }

src/pages/order_addcart/index.vue

@@ -29,10 +29,12 @@ const state = reactive({
 
   totalCartCount: 0,
   totalPrice: 0,
-  selectAll: false,
+  selectAllIndeterminate: false,
 
   cart_id: [],
   isManage: true,
+
+  currentType: '',
 })
 
 const shopping = ref<ShoppingResult>()
@@ -102,12 +104,15 @@ function loadCartList() {
       // shopItem.allCheck = true
 
       shopItem.allCheck = false
+      shopItem.indeterminate = false
       shopItem.list.forEach(goodItem => {
         goodItem.check = false
         // state.cart_id.push(goodItem.cart_id)
         // if (goodItem.cart_num === 1) {}
+        state.totalCartCount += Number.parseInt(goodItem.cart_num)
       })
-      console.log(shopItem)
+      // console.log(shopItem)
+
     })
     // cartAllCheck("all")
     // if (shopping.value) {
@@ -141,16 +146,23 @@ const totalCartInfo = computed(() => {
 const totalMoney = ref(0)
 const isAllSelect = ref(false)
 
-function handleGoodsItemCheck() {
-  cartAllCheck('single')
+function handleGoodsItemCheck(check) {
+  // console.log('good item check....')
+  // console.log(check)
+  // if (isAllSelect.value) {return}
+  // cartAllCheck('single')
+  _singleCheck()
 }
 
 function shopCheck(shopItem) {
-  if (shopItem.allCheck) {
+  console.log('shop check...')
+  console.log(shopItem)
+  if (shopItem.allCheck && !shopItem.indeterminate) {
     console.log(shopItem)
     shopItem.list.forEach((good, index) => {
       good.check = true
     })
+
   } else {
     shopItem.list.forEach((good, index) => {
       good.check = false
@@ -161,24 +173,39 @@ function cartAllCheck(type: 'single' | 'all') {
   let allArr = []
   let totalMoney = 0
   let totalNum = 0
+  state.currentType = type
 
+  console.log(type)
   shopping.value?.list.forEach((goods, index) => {
     if (type === 'single') {
       // 如果单选的情况下, 获取已选中的
       let tempArr = goods.list.filter(goodItem => {
-        console.log(goodItem.check)
         // if (goodItem.check) {
           return goodItem.check === true
         // }
       })
-      console.log(tempArr)
+      console.log(goods.list.length + '购物车长度')
       if (goods.list.length === tempArr.length) {
+        console.log('这里是全选状态了。。。。')
         goods.allCheck = true
         allArr.push(goods)
-      } else {
-        // goods.allCheck = false
+        goods.indeterminate = false
+        return
+      }
+
+      console.log(tempArr.length + '---当长长度')
+      if (tempArr.length > 0) {
+        goods.indeterminate = true
+        return
+      }
+      if (tempArr.length <= 0) {
+        goods.allCheck = false
+        state.currentType = 'all'
+        state.indeterminate = false
+        return
       }
     } else {
+      console.log('alll type......')
       goods.list.forEach(goodItem => {
         goodItem.check = isAllSelect.value
       })
@@ -199,10 +226,103 @@ function cartAllCheck(type: 'single' | 'all') {
   })
 
   isAllSelect.value = allArr.length === shopping.value?.list.length
-  state.totalCartCount = totalNum
+  // state.totalCartCount = totalNum
   state.totalPrice = totalMoney
 }
 
+function _singleCheck() {
+  state.currentType = 'single'
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+  state.cart_id = []
+  shopping.value?.list.forEach((goods, index) => {
+      // 如果单选的情况下, 获取已选中的
+      let tempArr = goods.list.filter(goodItem => {
+        // if (goodItem.check) {
+        return goodItem.check === true
+        // }
+      })
+      if (goods.list.length === tempArr.length) {
+        goods.allCheck = true
+        allArr.push(goods)
+        goods.indeterminate = false
+      }
+
+      if (tempArr.length > 0) {
+        goods.indeterminate = true
+      }
+      if (tempArr.length <= 0) {
+        console.log('没有选中的了。。。')
+        goods.allCheck = false
+        state.currentType = 'all'
+        goods.indeterminate = false
+      }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        console.log(goodItem)
+
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        console.log(totalMoney)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+  if (allArr.length === shopping.value?.list.length) {
+    isAllSelect.value = true
+    state.currentType = 'all'
+  } else if (allArr.length > 0){
+    state.selectAllIndeterminate = true
+  } else {
+    isAllSelect.value = false
+
+  }
+  state.totalPrice = totalMoney
+}
+function _selectAll() {
+  // if current == single 说明刚才操作的置为多选是从这里来的？
+  console.log(state.currentType)
+  state.currentType = 'all'
+  let allArr = []
+  let totalMoney = 0
+  let totalNum = 0
+  // state.currentType = type
+  //
+  // console.log(type)
+  shopping.value?.list.forEach((goods, index) => {
+
+      goods.list.forEach(goodItem => {
+        goodItem.check = isAllSelect.value
+      })
+      goods.allCheck = isAllSelect.value
+      if (goods.allCheck) {
+        allArr.push(goods)
+      }
+
+    // 总金额｜总数
+    goods.list.forEach(goodItem => {
+      if (goodItem.check) {
+        totalMoney += (goodItem.productAttr.price * goodItem.cart_num)
+        totalNum += Number.parseFloat(goodItem.cart_num)
+        state.cart_id.push(goodItem.cart_id)
+      }
+    })
+  })
+
+  isAllSelect.value = allArr.length === shopping.value?.list.length
+  // state.totalCartCount = totalNum
+  state.totalPrice = totalMoney
+}
+
+// watch(() => isAllSelect.value, (val) => {
+//   if (!val) {
+//     state.cart_id = []
+//   }
+// })
+
 function reTotal() {
   let allArr = []
   let totalMoney = 0
@@ -219,16 +339,31 @@ function reTotal() {
     })
   })
 
-  isAllSelect.value = allArr.length === shopping.value?.list.length
-  state.totalCartCount = totalNum
+  // isAllSelect.value = allArr.length === shopping.value?.list.length
+  // state.totalCartCount = totalNum
   state.totalPrice = totalMoney
 }
 function handleSelectAll(checked: boolean) {
+  // 如何区分是由当前的 checkbox 发起的？要区
+  // console.log(state.currentType + '这里是当前类型。。。。')
+
+  if (state.currentType === 'single') {
+    return
+  //   _singleCheck()
+  }
+  _selectAll()
+  // if (state.currentType == 'single') {
+  //   return
+  // }
+  // console.log(isAllSelect.value)
+  // if (isAllSelect.value) {
+  // cartAllCheck('all')
+
+  // }
   // console.log('000')
   // isAllSelect.value = !isAllSelect.value
   // isAllSelect.value = checked
   // 这里需要修改 checkbox 的检查
-  cartAllCheck('all')
 }
 
 function handleManageCart() {
@@ -373,7 +508,10 @@ function handleNumberChange(num, goodItem) {
           <div
               class="f-hairline-bottom flex  items-center font-bold p-3"
           >
-            <nut-checkbox v-model="shopItem.allCheck" @change="shopCheck(shopItem)" label="全选"
+            <nut-checkbox v-model="shopItem.allCheck"
+                          @change="shopCheck(shopItem)"
+                          :indeterminate="shopItem.indeterminate"
+                          label="全选"
                           class="!text-primary"
             >
               {{ shopItem.mer_name }}
@@ -398,7 +536,7 @@ function handleNumberChange(num, goodItem) {
             <div class="flex flex-col gap-1 w-full">
               <div
                   @click="handleProductItemClick(goodItem)"
-                  class="text-overflow line-clamp-1">{{ goodItem.product.store_name }}</div>
+                  class="text-overflow line-clamp-2 text-xs">{{ goodItem.product.store_name }}</div>
               <div class="flex flex-col justify-start gap-1">
                 <div
                     class="text-[10px] text-gray min-w-5  p-1  items-center flex">
@@ -457,11 +595,12 @@ function handleNumberChange(num, goodItem) {
   </div>
 
   <div v-if="hasShopping"
-      class="fixed bottom-0 w-full">
+      class="fixed bottom-0 w-full z-3">
     <div class="bg-white h-10 flex justify-between" v-if="shopping && shopping.list">
       <div class="flex justify-center items-center gap-2 pl-3">
         <nut-checkbox v-model="isAllSelect"
                       @change="handleSelectAll"
+                      :indeterminate="state.selectAllIndeterminate"
                       label="全选"
                       class="!text-primary"
         >全选
@@ -470,7 +609,7 @@ function handleNumberChange(num, goodItem) {
       </div>
 
       <div class="flex justify-center items-center gap-2 pr-3">
-        <div class="flex text-[12px]">
+        <div class="flex text-[12px]" v-if="state.isManage">
           合计：
           <FPrice :price="state.totalPrice"></FPrice>
 <!--          {{totalCartInfo.totalPrice}}-->

src/pages/payment/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <CXBBasePage>
     <div class="w-full">
       <div class=" flex flex-col gap-3 p-3">
         <div class="flex flex-col justify-center items-center bg-white rounded p-4">
@@ -29,8 +28,6 @@
 
       </div>
     </div>
-
-  </CXBBasePage>
 </template>
 <script setup lang="ts">
 import FPrice from "~/components/FPrice/FPrice.vue";
@@ -103,4 +100,10 @@ function handleConfirm() {
 <route lang="yaml">
 style:
   navigationBarTitleText: 支付方式
-</route>
+</route>
+
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/pension_record/list.vue

@@ -1,84 +1,252 @@
 <script setup lang="ts">
-import {getYanglaoJinLogXs, getUserYanglaoJinLogXx} from "~/apis/user";
+import {getYanglaoJinLogXs, getUserYanglaoJinLogXx, getUserYanglaoJinLog, getUserYanglaoJinLogx} from "~/apis/user";
 import {getThirdOrder} from "~/apis/order.api";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
 import {encodeBase64} from "~/utils/http/helper";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {searchProductList} from "~/apis/product";
+
 const list = ref([])
 const state = reactive({
-  type: ''
+  type: '',
+
+  status: 'noMore',
+
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  list: []
 })
 onLoad((options) => {
   state.type = options.type
-  if (state.type == '99') {
-    getUserYanglaoJinLogXx({
-      page: 1,
-      limit: 20,
-      source: '1'
-    }).then(res => {
-      list.value = res.list
-    }).catch(error => {
-      if (error === '请登录') {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
-        })
+  loadList('reload')
+})
+
+function _load01List(action: 'reload' | 'page', params: {
+  page: number
+  limit: number
+  // 1 线下 0 线上
+  // source: '0' | '1'
+  source: string
+}, callback?: (items) => void) {
+
+  // console.log(params)
+  getUserYanglaoJinLog({
+    page: params.page,
+    limit: params.limit,
+    source: params.source
+  }).then(res => {
+    // list.value = res.list
+    console.log(res)
+    if (res && res.list) {
+      if (action === 'page') {
+        // state.list = res.list
+        state.list = state.list.concat(res.list)
       }
-    })
-  }
+      if (action === 'reload') {
+        state.list = res.list
+      }
+
+      state.totalPage = Math.ceil(res.count / state.pageSize);
+      state.status = 'more'
 
-  if (state.type == '90') {
-    getYanglaoJinLogXs({
-      page: 1,
-      limit: 20,
-      source: '0'
-    }).then(res => {
-      list.value = res.list
-    }).catch(error => {
-      if (error === '请登录') {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
-        })
+      if (callback) {
+        callback(res.list)
       }
-    })
-  }
+    }
+
+  }).catch(error => {
+    if (error === '请登录') {
+      uni.navigateTo({
+        url: '/pages/user/login/index'
+      })
+    }
+  })
+}
+
+function _loadThirdList(action: 'page' | 'reload', params: {
+  page: number
+  limit: number
+  // 1 线下 0 线上
+  // source: '0' | '1'
+  type: string
+}, callback?: (items: any) => void) {
+  getThirdOrder({
+    ...params
+  }).then(res => {
+    if (res && res.list) {
+      if (action === 'page') {
+        state.list = state.list.concat(res.list)
+      }
+      if (action === 'reload') {
+        state.list = res.list
+      }
+
+      state.status = 'more'
 
-  if (state.type != 90 && state.type !=99) {
-    getThirdOrder({
-      page: 1,
-      limit: 20,
-      type
-    }).then(res => {
-      list.value = res.list
-    }).catch(error => {
-      if (error === '请登录') {
-        uni.navigateTo({
-          url: '/pages/user/login/index'
-        })
+      if (callback) {
+        callback(res.list)
       }
-    })
+    }
+  })
+}
+
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action == 'reload') {
+    state.currentPage = 1
+  }
+  let pageParams = {
+    page: state.currentPage,
+    limit: state.pageSize,
+  }
+  let queryLogParams = {
+    source: '0'
+  }
+
+  let queryThirdParams = {
+    type: state.type
   }
+  console.log(state.type)
+  if (state.type === '99') {
+    queryLogParams.source = '1'
+    const params = {
+      ...pageParams,
+      ...queryLogParams
+    }
+    _load01List(action, params, callback)
+  } else if (state.type === '90') {
+    queryLogParams.source = '0'
+    const params = {
+      ...pageParams,
+      ...queryLogParams
+    }
+    _load01List(action, params, callback)
+  } else {
+    const params = {
+      ...pageParams,
+      ...queryThirdParams
+    }
+    _loadThirdList(action, params, callback)
+  }
+
+}
+
+// 有分页参数
+// 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)
+//   }
+// }
+// 无分页参数
+function handleScrollToLower() {
+  state.status = 'loading';
+  state.currentPage += 1;
+
+  if (state.type == '90' || state.type == '99') {
+    if (state.currentPage > state.totalPage) {
+      state.status = 'noMore';
+    } else {
+      setTimeout(() => {
+        loadList('page')
+      }, 300)
+    }
+  } else {
+    setTimeout(() => {
+      loadList('page', (items) => {
+        // uni.hideLoading()
+        if (!items.length > 0) {
+          console.log('没有更多了')
+          state.status = 'noMore'
+          state.currentPage -= 1;
+        }
+      })
+    }, 300)
+
+  }
+
+  // loadList('page', (items) => {
+  //   // uni.hideLoading()
+  //   console.log(items)
+  //
+  //   if (!items.length > 0) {
+  //     console.log('没有更多了')
+  //     state.status = 'noMore'
+  //     state.currentPage -= 1;
+  //   }
+  // })
+}
+
+onReachBottom(() => {
+  handleScrollToLower()
+
+})
+
+onPullDownRefresh(() => {
+  loadList('reload', items => {
+    setTimeout(() => {
+      uni.stopPullDownRefresh()
+    }, 300)
+  })
 })
 
 function handleItemClick(item) {
   uni.navigateTo({
-    url: '/pages/pension_record/detail?detail=' + encodeBase64(Object.assign({}, item, { tradeType: '', remark: ''}))
+    url: '/pages/pension_record/detail?detail=' + encodeBase64(Object.assign({}, item, {tradeType: '', remark: ''}))
   })
 }
 </script>
 
 <template>
-  <CXBBasePage>
-    <div v-if="list && list.length > 0" class="flex flex-col gap-3 p-3">
+  <div class="pb-safe">
+    <div v-if="state.list && state.list.length > 0" class="flex flex-col gap-3 p-3">
+
       <div
-          v-if="state.type != 90"
+          v-if="state.type == '90'"
           @tap="handleItemClick(item)"
-          v-for="(item, index) in list" :key="index" class="bg-white rounded p-3 text-[12px]">
+          v-for="(item, index) in state.list" :key="index" class="bg-white rounded p-3 text-[12px]">
         <div class="flex items-center gap-3 text-[12px]">
-          <image :src="item.goods_img" mode="widthFix" class="w-15 h-15"></image>
+          <image :src="item.product.product.image" mode="widthFix" class="w-15 h-15"></image>
           <div class="flex flex-col">
-            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.goods_name }}</div>
-            <CXBYaojinTag :amount="item.yanglao" />
+            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.product.product.store_name }}</div>
+            <CXBYaojinTag :amount="item.number"/>
+          </div>
+        </div>
+        <div class="flex text-gray text-[12px] f-hairline-bottom py-3">
+          订单号：{{ item.order_sn }}
+        </div>
+        <div class="flex flex-col gap-2 pt-3">
+          <div class="flex">
+            下单时间：{{ item.create_time }}
+          </div>
+          <div class="flex justify-between items-center">
+            <div>
+              养老金来源：购买商品
+            </div>
+            <div class="flex items-center text-gray">
+              <div>详情</div>
+              <div class="f-text-color-2 i-tabler-chevron-right"></div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+          v-else-if="state.type == '99'"
+          @tap="handleItemClick(item)"
+          v-for="(item, index) in state.list" :key="index" class="bg-white rounded p-3 text-[12px]">
+        <div class="flex items-center gap-3 text-[12px]">
+          <image :src="item.mer_avatar" mode="widthFix" class="w-15 h-15"></image>
+          <div class="flex flex-col">
+            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.mer_name }}</div>
+            <CXBYaojinTag :amount="item.number"/>
           </div>
         </div>
         <div class="flex text-gray text-[12px] f-hairline-bottom py-3">
@@ -102,12 +270,12 @@ function handleItemClick(item) {
       <div
           v-else
           @tap="handleItemClick(item)"
-          v-for="(item, index) in list" :key="index" class="bg-white rounded p-3 text-[12px]">
+          v-for="(item, index) in state.list" :key="index" class="bg-white rounded p-3 text-[12px]">
         <div class="flex items-center gap-3 text-[12px]">
-          <image :src="item.product.product.image" mode="widthFix" class="w-15 h-15"></image>
+          <image :src="item.goods_img" mode="widthFix" class="w-15 h-15"></image>
           <div class="flex flex-col">
-            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.product.product.store_name }}</div>
-            <CXBYaojinTag :amount="item.number" />
+            <div class=" text-[12px] line-clamp-2 w-[90%]">{{ item.goods_name }}</div>
+            <CXBYaojinTag :amount="item.yanglao"/>
           </div>
         </div>
         <div class="flex text-gray text-[12px] f-hairline-bottom py-3">
@@ -128,15 +296,30 @@ function handleItemClick(item) {
           </div>
         </div>
       </div>
+      <div class=" flex justify-center items-center text-[12px] text-gray-500"
+           v-if="state.list && state.list.length > 0">
+        <div v-if="state.status === 'loading'">
+          加载中...
+        </div>
+        <div v-if="state.status === 'noMore'">
+          没有更多了～
+        </div>
+      </div>
 
     </div>
 
-    <CXBEmpty v-else />
-  </CXBBasePage>
+    <CXBEmpty v-else/>
+  </div>
+
 </template>
 
 <route lang="yaml">
 style:
-  navigationBarTitleText: 养老金
-  enablePullDownRefresh: true
+navigationBarTitleText: 养老金
+enablePullDownRefresh: true
 </route>
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/revenue-sharing/index.vue

@@ -44,8 +44,8 @@ onLoad((option: any) => {
   getSelectUserInviteProfit({uid: userStore.uid}).then(res => {
     console.log(res)
     state.numberSun = res.numberSun
-    state.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit
-    state.UserYesterdayInviteProfit = res.UserYesterdayInviteProfit
+    state.UserUnsettledInviteProfit = res.UserUnsettledInviteProfit ? res.UserUnsettledInviteProfit : '0.00'
+    state.UserYesterdayInviteProfit = res.UserUnsettledInviteProfit ? res.UserUnsettledInviteProfit : '0.00'
   })
 
   getAgentInfo().then(res => {
@@ -99,9 +99,10 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   })
 }
 
-function handleTabClick(type) {
+function handleTabClick(type: number) {
   state.currentTab = type
   state.type = type
+  state.list = []
   loadList('reload')
   // loadList(type)
 }

src/pages/store/home/index.vue

@@ -191,7 +191,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     if (res && res.pageInfo) {
       state.triggered = false
       if (action === 'page') {
-        productList.value = productList.value.contact(res.pageInfo.list)
+        productList.value = productList.value.concat(res.pageInfo.list)
       }
       if (action === 'reload') {
         productList.value = res.pageInfo.list

src/pages/store/home/search.vue

@@ -97,7 +97,7 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
   }).then(res => {
     state.triggered = false
     if (action === 'page') {
-      productList.value = productList.value.contact(res.pageInfo.list)
+      productList.value = productList.value.concat(res.pageInfo.list)
     }
     if (action === 'reload') {
       productList.value = res.pageInfo.list

src/pages/store/product/detail.vue

@@ -186,6 +186,7 @@ function handleAddCart() {
 
 function handleCreateShopping() {
   console.log(state.flag)
+  console.log(state.currentSku.unique)
   createShopping({
     product_id: detail.value.product_id,
     // product_attr_unique: JSON.stringify(state.currentSku),
@@ -193,6 +194,7 @@ function handleCreateShopping() {
     cart_num: state.cartNum,
     is_new: (state.flag === '1' || state.flag === '3') ? '1': '0'
   }).then(res => {
+    console.log(res)
     if (res.cart_id) {
       console.log(state.flag)
       if (state.flag == '1' || state.flag == '3') {
@@ -413,12 +415,14 @@ function handleShowCustomer() {
 
         <div class="flex gap-3 text-[12px]">
           <div>分享：</div>
-          <div class="flex-1  items-center flex  " @click="shareShowTips = true">
-            <div class="flex gap-2 w-1/2">
+          <div class="flex-1  items-center flex  ">
+              <button open-type="share" class="flex gap-2 w-1/2 text-[12px]">
+
               <image :src="wx_shareImg" mode="widthFix" class="w-5 h-5"></image>
               <div>微信</div>
-            </div>
-            <div class="flex gap-2 w-1/2">
+              </button>
+
+            <div class="flex gap-2 w-1/2" @click="shareShowTips = true">
               <image :src="pyqImg" mode="widthFix" class="w-5 h-5"></image>
               <div>朋友圈</div>
             </div>
@@ -652,6 +656,18 @@ function handleShowCustomer() {
 page {
   background-color: #f8f8f8;
 }
+ button {
+   margin: 0;
+   padding: 0;
+   outline: none;
+   border-radius: 0;
+   background-color: transparent;
+   line-height: inherit;
+ }
+
+button::after {
+  border: none;
+}
 
 </style>
 <route lang="yaml">

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

@@ -153,7 +153,7 @@ export default {
       if (!state.addressId) return false
 
       getUserAddressDetail(state.addressId).then(res => {
-        console.log(res)
+        // console.log(res)
         // let region = [res.province, res.city, res.district]
         formData.address = [res.province, res.city, res.district]
         // state.cityId = res.city_id
@@ -191,14 +191,14 @@ export default {
       })
     }
     const validate = (item: any) => {
-      console.log(item);
+      // console.log(item);
     };
     const ruleForm = ref<any>(null);
 
     const submit = () => {
       ruleForm.value.validate().then(({ valid, errors }: any) => {
         if (valid) {
-          console.log('success', formData);
+          // console.log('success', formData);
           const province = formData.address[0]
           const city = formData.address[1]
           const district = formData.address[2]
@@ -232,9 +232,14 @@ export default {
           // }
 
           if (basicData.addressObject.length > 0) {
-            console.log(basicData.addressObject)
+            // console.log(basicData.addressObject)
             provinceId = basicData.addressObject[0].id
             cityId = basicData.addressObject[1].id
+            // console.log('city_id: ' + cityId)
+            if (!cityId) {
+              cityId = '1'
+            }
+
             districtId = basicData.addressObject[2].id
             countryId = basicData.addressObject[3].id
             if (formData.address[3]) {
@@ -257,14 +262,14 @@ export default {
             real_name: formData.name,
             detail: formData.detail,
             code_list: formData.code_list,
-            // city_id: '2',
-            city_id: cityId,
+            city_id: cityId ? cityId : '1',
+            // city_id: cityId,
             village_id: formData.villageId,
             village: formData.village,
             address_id: formData.address_id
             // address_id
           }).then(res => {
-            console.log(res)
+            // console.log(res)
             if (res) {
               uni.showToast({
                 title: '保存成功'
@@ -298,7 +303,7 @@ export default {
               }, 1000)
             }
           }).catch(message => {
-            console.log(message)
+            // console.log(message)
             uni.hideLoading()
 
             uni.showToast({
@@ -307,7 +312,7 @@ export default {
             })
           })
           // formData.address
-          console.log(formData.address.length)
+          // console.log(formData.address.length)
         } else {
           console.log('error submit!!', errors);
         }
@@ -320,7 +325,7 @@ export default {
     const customBlurValidate = (prop: string) => {
       ruleForm.value.validate(prop).then(({ valid, errors }: any) => {
         if (valid) {
-          console.log('success', formData);
+          // console.log('success', formData);
 
         } else {
           console.log('error submit!!', errors);
@@ -349,7 +354,7 @@ export default {
         basicData.addressObject = arg2
       },
       pathChange(...args: any) {
-        console.log('pathChange', ...args);
+        // console.log('pathChange', ...args);
       },
     };
 
@@ -397,6 +402,12 @@ export default {
   background: none !important;
   box-shadow: none !important;
 }
+.nut-cell__value .nut-form-item__body {
+  color: #000 !important;
+}
+.input-text {
+  color: #000 !important;
+}
 </style>
 <route lang="yaml">
 style: