feat: fix

src/apis/common.ts

@@ -85,28 +85,38 @@ export function closeAccount(phone: string) {
 }
 
 export function getLocal() {
-    uni.showModal({
-        title: '提示',
-        content: '为了您更好的体验，请同意授权位置',
-        success: (res) => {
-            if (res.confirm) {
-                uni.getLocation({
-                    type: 'wgs84',
-                    success(res) {
-                        console.log(res)
-                        uni.setStorageSync(USER_LATITUDE, res.latitude)
-                        uni.setStorageSync(USER_LONGITUDE, res.longitude)
-                        // getRegeo(res.latitude, res.longitude);
-                    }
-                })
-                // amap.getWxLocation(async (loc) => {
-                    // 获取地址描述数据
-                    // const regeoRes = await amap.getRegeo({location: loc});
-                    // console.log(regeoRes.data.regeocode.addressComponent)
-                // })
-            }
+    uni.getLocation({
+        type: 'wgs84',
+        success(res) {
+            console.log(res)
+            uni.setStorageSync(USER_LATITUDE, res.latitude)
+            uni.setStorageSync(USER_LONGITUDE, res.longitude)
+            // getRegeo(res.latitude, res.longitude);
         }
     })
+
+    // uni.showModal({
+    //     title: '提示',
+    //     content: '为了您更好的体验，请同意授权位置',
+    //     success: (res) => {
+    //         if (res.confirm) {
+    //             uni.getLocation({
+    //                 type: 'wgs84',
+    //                 success(res) {
+    //                     console.log(res)
+    //                     uni.setStorageSync(USER_LATITUDE, res.latitude)
+    //                     uni.setStorageSync(USER_LONGITUDE, res.longitude)
+    //                     // getRegeo(res.latitude, res.longitude);
+    //                 }
+    //             })
+    //             // amap.getWxLocation(async (loc) => {
+    //                 // 获取地址描述数据
+    //                 // const regeoRes = await amap.getRegeo({location: loc});
+    //                 // console.log(regeoRes.data.regeocode.addressComponent)
+    //             // })
+    //         }
+    //     }
+    // })
 }
 
 export async function getRegeo(latitude: number, longitude: number) {

src/components/CXBDialogSignIn/CXBDialogSIgnIn.vue

@@ -108,9 +108,10 @@ function confirmHandler() {
     if (res) {
       signInScore.value = res.score
       signInSuccess.value = true
+      uni.$emit('NEW_SIGN_IN_SUCCESS')
     }
   })
-  emit(CONFIRM_EVENT)
+  // emit(CONFIRM_EVENT)
 }
 
 function handleSignInSucceedClose() {
@@ -157,7 +158,7 @@ function handleSignInSucceedClose() {
     </div>
     <div
         @click.stop="closeHandler"
-        class="relative bottom-40 flex justify-center items-center"
+        class="relative bottom-30 flex justify-center items-center"
     >
       <image :src="signInCloseImage" class="h-8 w-8"></image>
     </div>

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-[60%] max-h-[80%]"
+      exClass="rounded-rt-xl rounded-lt-xl flex flex-col pb-safe h-min-[60%] max-h-[80%]"
 
   >
     <div class="flex flex-col justify-between h-full">

src/pages/article/detail.vue

@@ -32,7 +32,7 @@ onLoad((option: any) => {
       <div class="font-bold">
         {{article.title}}
       </div>
-      <div class="text-xs py-4">
+      <div class=" py-4">
         <mpHtml :content="article.content.content"></mpHtml>
       </div>
 

src/pages/help-center/index.vue

@@ -20,7 +20,7 @@ function handleShowArticleList(category: ArticleCategoryModel) {
 <template>
   <div>
     <div class="my-3 bg-white p-3">
-      <div class="text-xs font-bold">自助服务</div>
+      <div class=" font-bold">自助服务</div>
       <div class="flex justify-around py-2">
         <div v-for="(item, index) in list" :key="index"
              @tap="handleShowArticleList(item)"

src/pages/home/index.vue

@@ -60,7 +60,7 @@ onLoad(() => {
     // 2 检查用户签到信息
     getNewSignInInfo().then(res => {
       const {today, day} = res
-      state.signToday = today
+      state.signToday = day
       if (today === 0) {
         state.isShowSignIn = true
       }

src/pages/immediate-withdrawal/index.vue

@@ -21,7 +21,9 @@ const yanglaojin = ref<UserYanglaoJinModel>()
 
 const widthdrawalConfig = ref({})
 
-const cashWithdrawalAmount = ref(0)
+const cashWithdrawalAmount = ref()
+
+const isDisabled = ref(true)
 // userSpreadInfo.value.brokerage_price
 onLoad(async () => {
   await userStore.getUserInfo()
@@ -36,6 +38,7 @@ onLoad(async () => {
 
 watch(() => cashWithdrawalAmount.value, (val) => {
   if (val && isNumber(Number.parseFloat(val))) {
+    isDisabled.value = false
     getWithdrawalService({
       money: val
     }).then(res => {
@@ -44,6 +47,7 @@ watch(() => cashWithdrawalAmount.value, (val) => {
       console.log(res)
     })
   } else {
+    isDisabled.value = true
     withdrawalCal.value = {}
   }
 })
@@ -62,6 +66,9 @@ function handleInputAll() {
  * 立即提现
  */
 function handleImmediateWithdrawal() {
+  if (isDisabled.value) {
+    return
+  }
   console.log(yanglaojin.value)
   // 1 判断是否需要实名
   if (!yanglaojin.value?.is_certification == 1) {
@@ -71,22 +78,34 @@ function handleImmediateWithdrawal() {
   }
 
   if (widthdrawalConfig.value.withdrawal_status == '0') {
+    isDisabled.value = true
     return uni.showToast({
       title: '提现功能关闭',
       icon: 'none'
     })
   }
   if (widthdrawalConfig.value.withdrawal_wchat == '0') {
+    isDisabled.value = true
+
     return uni.showToast({
       title: '微信提现功能关闭',
       icon: 'none'
     })
   }
+  if (cashWithdrawalAmount.value > userSpreadInfo.value?.brokerage_price ) {
+    isDisabled.value = true
+    return uni.showToast({
+      title: '输入金额超过可提现余额',
+      icon: 'none'
+    })
+  }
 
   if (userSpreadInfo.value?.brokerage_price) {
     if (userSpreadInfo.value?.brokerage_price < widthdrawalConfig.value.withdrawal_money) {
+      isDisabled.value = true
       return uni.showToast({
-        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现'
+        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现',
+        icon: 'none'
       })
     }
   } else {
@@ -95,7 +114,6 @@ function handleImmediateWithdrawal() {
 
 
 
-
   getApplicationWithdrawal({ extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
     // uni.showToast({
     //   title: res,
@@ -188,6 +206,7 @@ function handleShowAgreement(type) {
     <div class="flex flex-col">
       <div class=" flex rounded-full bg-red-300">
         <nut-button type="primary" block
+                    :disabled="isDisabled"
              @tap="handleImmediateWithdrawal"
         >
           立即提现

src/pages/my-integral/index.vue

@@ -22,12 +22,12 @@ onShow(() => {
   } else {
   }
 })
-
-if (userStore.userInfo) {
+function loadSignInInfo() {
   // 2 检查用户签到信息
   getNewSignInInfo().then(res => {
+    console.log(res)
     const {today, day} = res
-    state.signToday = today
+    state.signToday = day
     if (today === 0) {
       state.isShowSignIn = true
     }
@@ -38,6 +38,29 @@ if (userStore.userInfo) {
     console.error(error + '->GetNewsSignInInfo')
   })
 }
+onLoad(() => {
+  uni.$on('NEW_SIGN_IN_SUCCESS', loadSignInInfo)
+
+})
+if (userStore.userInfo) {
+  loadSignInInfo()
+  // // 2 检查用户签到信息
+  // getNewSignInInfo().then(res => {
+  //   console.log(res)
+  //   const {today, day} = res
+  //   state.signToday = day
+  //   if (today === 0) {
+  //     state.isShowSignIn = true
+  //   }
+  //   // // if (today === 0) {
+  //   //   2.1 弹出签到窗口
+  //   // }
+  // }).catch(error => {
+  //   console.error(error + '->GetNewsSignInInfo')
+  // })
+}
+
+
 
 function handleSign() {
   console.log(state.signToday)

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

@@ -119,8 +119,7 @@ function shareImage() {
 }
 </script>
 <template>
-  <CXBBasePage>
-    <div class="relative top-0 left-0 min-h-screen h-full w-full bg-[#FFCB75] z-0 ">
+    <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
           @click="handleShowAgreement(17)"
@@ -251,7 +250,6 @@ function shareImage() {
 
     </div>
 
-  </CXBBasePage>
 </template>
 
 <style>

src/pages/order-confirm/index.vue

@@ -153,6 +153,8 @@ function payment(createOrderData: CreateOrderRequest) {
 
   orderCreate(createOrderData).then(res => {
     if (res) {
+      console.log('order_create')
+      console.log(res)
       uni.hideLoading()
       uni.navigateTo({
         // url: '/pages/payment/index?' + `cardId=${data.cartId}&type=1&product_id=${data.productId}`

src/pages/order/components/Order4List.vue

@@ -93,6 +93,11 @@ onMounted(() => {
   })
 })
 onUnmounted(() => {
+  uni.$on('orderComment', () => {
+    // loadAllOrderList()
+    // state.tabvalue = 4
+    loadList('reload')
+  })
   uni.$off('onTab4ReachBottom');
   uni.$off('onTab4PullDownRefresh');
 })

src/pages/order/components/OrderItem.vue

@@ -93,7 +93,7 @@ function handleCancelOrder() {
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}`
     // url: `/pages/payment/index`
   })
 }

src/pages/order/components/OrderObligationItem.vue

@@ -93,7 +93,7 @@ function handleCancelOrder() {
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}`
     // url: `/pages/payment/index`
   })
 }

src/pages/order/components/RefundOrderItem.vue

@@ -92,7 +92,7 @@ function handleCancelOrder() {
 function handlePayment() {
   const { orderItem } = props
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.order_id}&OrderList=${JSON.stringify(orderItem)}`
+    url: '/pages/payment/index?' + `pay_price=${orderItem.pay_price}&order_id=${orderItem.group_order_id}&OrderList=${JSON.stringify(orderItem)}`
     // url: `/pages/payment/index`
   })
 }

src/pages/order/index.vue

@@ -94,6 +94,11 @@ uni.$on('orderTakeFromList', () => {
   state.tabvalue = 3
 })
 
+uni.$on('orderComment', () => {
+  // loadAllOrderList()
+  state.tabvalue = 4
+})
+
 onReachBottom(() => {
   // handleScrollToLower()
   if (state.tabvalue == 0) {

src/pages/order/logistics.vue

@@ -10,6 +10,7 @@ import {
 } from "~/apis/model/product.model";
 import {DcProductModel} from "~/apis/model/dacang.model";
 import {getLogistics} from "~/apis/order.api";
+import {encodePhone} from "../../utils";
 
 const like_adorn_220628Image = CDN_URL + '/static/assets/like_adorn_220628.png'
 
@@ -165,7 +166,7 @@ function handleClipboard() {
 
         <div class="flex items-center gap-2 ">
           <div class="rounded-full w-4 h-4 bg-gray-400 text-white flex flex-col justify-center items-center">收</div>
-          <div class="text-gray-400">{{ state.orderDetail.user_address + ' ' + state.orderDetail.real_name + ' ' + state.orderDetail.user_phone}}</div>
+          <div class="text-gray-400">{{ state.orderDetail.user_address + ' ' + state.orderDetail.real_name + ' ' + encodePhone(state.orderDetail.user_phone)}}</div>
         </div>
 
         <!-- 物流动态 -->
@@ -221,7 +222,7 @@ function handleClipboard() {
 </template>
 <route lang="yaml" >
 style:
-navigationBarTitleText: 已发货
+  navigationBarTitleText: 已发货
 </route>
 
 <style lang="scss">

src/pages/order/obligation-detail.vue

@@ -51,7 +51,7 @@ function handlePayment() {
   // const { orderItem } = detail.value
   // console.log(orderItem)
   uni.navigateTo({
-    url: '/pages/payment/index?' + `pay_price=${ detail.value.total_price}&order_id=${ detail.value.group_order_id}&OrderList=${JSON.stringify( detail.value.orderList)}`
+    url: '/pages/payment/index?' + `pay_price=${ detail.value.pay_price}&order_id=${ detail.value.group_order_id}&OrderList=${JSON.stringify( detail.value.orderList)}`
     // url: `/pages/payment/index`
   })
 }

src/pages/revenue-sharing/index.vue

@@ -76,6 +76,9 @@ onLoad((option: any) => {
 // }
 
 function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
   getRevenueSharing({
     page: state.currentPage,
     limit: state.pageSize,

src/pages/search/index.vue

@@ -183,6 +183,11 @@ function loadProductList(action: 'page' | 'reload', callback?: (items) => void)
         // state.totalPage = Math.ceil()
         // res[0].
         // console.log(res)
+      }).catch(error => {
+        uni.showToast({
+          title: error,
+          icon: "none"
+        })
       })
       break;
     }

src/pages/search/search-dacang.vue

@@ -318,6 +318,17 @@ async function handleRemoveAllKeyword() {
   await uni.setStorageSync('HISTORY_KEYWORDS', [])
 }
 
+async function handleHistoryKeywordSearch(keywordItem) {
+  // keywordItem.keyword
+  // if (keywordItem.keyword) {
+    searchValue.value = keywordItem
+    // state.historyKeyWords.push(searchValue.value)
+    // state.historyKeyWords = uniq(state.historyKeyWords)
+    // await uni.setStorageSync('HISTORY_KEYWORDS', state.historyKeyWords)
+    loadProductList('reload')
+    isSearchMode.value = true
+  // }
+}
 async function handleKeywordSearch(keywordItem) {
   // keywordItem.keyword
   if (keywordItem.keyword) {
@@ -329,7 +340,6 @@ async function handleKeywordSearch(keywordItem) {
     isSearchMode.value = true
   }
 }
-
 function handleShowMerchant(merchant) {
   console.log(merchant)
   uni.navigateTo({
@@ -379,7 +389,9 @@ function handleShowMerchant(merchant) {
                class="flex justify-center items-center border border-solid border-gray-200 text-[12px] rounded-full min-w-6 text-center  max-w-fit px-2 py-1 bg-white"
                :class="state.isDel ? 'gap-2': ''"
           >
-            <div class="flex-1">
+            <div class="flex-1"
+                 @click="handleHistoryKeywordSearch(tagItem)"
+            >
               {{ tagItem }}
             </div>
             <div class="flex" v-if="state.isDel" @click="handleRemoveKeyword(tagItem)">

src/pages/store/home/index.vue

@@ -28,7 +28,10 @@ const state = reactive({
 
   status: 'noMore',
   triggered: false,
+
+  params: {},
   priceType: NaN,
+  is_best: NaN,
   sales: NaN,
   is_new: NaN,
   type: NaN,
@@ -71,28 +74,89 @@ onLoad((options: any) => {
 //     mer_id: id.value
 //   })
 // }
+// private void requestGoodsList() {
+//   Map<String, Object> map = new HashMap<>();
+//   map.put("pageNum", mPage);
+//   map.put("pageSize", "60");
+//   map.put("mer_id", merId);
+//   //推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7
+//   if (requestType == 1) {
+//     map.put("is_best", 0);
+//   } else if (requestType == 2) {
+//     map.put("sales", 0);
+//   } else if (requestType == 3) {
+//     map.put("is_new", 0);
+//   } else if (requestType == 4) {
+//     map.put("priceType", 1);
+//   } else if (requestType == 5) {
+//     map.put("priceType", 0);
+//   } else if (requestType == 6) {
+//     map.put("type", 1);
+//   } else if (requestType == 7) {
+//     map.put("type", 5);
+//   }
+//   shopViewModel.getSearchProductList(map);
+// }
+//
+
 function handleProductTypeChange(typeValue) {
-  if (typeValue === 3) {
-    state.priceType = NaN
-    state.sales = NaN
-    state.is_new = 0
+  if (typeValue == 1) {
+    state.params = {
+      is_best: 0
+    }
   }
-  else if (typeValue === 2) {
-    state.priceType = NaN
-    state.is_new = NaN
-    state.sales = 0
-  } else {
-    state.type = typeValue
+  if (typeValue == 2) {
+    state.params = {
+      sales: 0
+    }
+  }
+  if (typeValue == 3) {
+    state.params = {
+      is_new: 0
+    }
+  }
+  // if (typeValue == 4) {
+  //   state.params = {
+  //     priceType: 1
+  //   }
+  // }
+  if (typeValue == 6) {
+    state.params = {
+      type: 1
+    }
+  }
+  if (typeValue == 7) {
+    state.params = {
+      type: 5
+    }
   }
+  // if (typeValue === 3) {
+  //   state.priceType = NaN
+  //   state.sales = NaN
+  //   state.is_new = 0
+  // }
+  // else if (typeValue === 2) {
+  //   state.priceType = NaN
+  //   state.is_new = NaN
+  //   state.sales = 0
+  // } else {
+  //   state.type = typeValue
+  //   state.priceType = NaN
+  //   state.is_new = NaN
+  //   state.sales = NaN
+  // }
   loadList('reload')
 }
 function handleOrderChange(priceType) {
   console.log(priceType)
   state.priceType = priceType
 
+  state.params = {
+    priceType,
+  }
   // reset
-  state.sales = NaN
-  state.is_new =NaN
+  // state.sales = NaN
+  // state.is_new =NaN
 
   loadList('reload')
 }
@@ -102,53 +166,50 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
     // mer_keyword: '',
     pageNum: state.currentPage,
     pageSize: state.pageSize,
-    // mer_id?: string
-    // mer_keyword?: string
-    // pageNum: number
-    // pageSize: number
-    // order: ORDER
-    //请求类别,推荐:1;销量:2;上新3;价格升序4,价格降序5;平台商品6;大仓商品7;
-    // is_best?: number
-    // sales?: number
-    // is_new?: number
-    // priceType?: number
-    // type?: number
-    // category_id?: string
-  }
-  if (state.type) {
-    params.type = state.type
-  }
-  if (state.sales === 0) {
-    params.sales = state.sales
-  }
-  // console.log(state.is_new)
-  if (state.is_new === 0) {
-    params.is_new = state.is_new
-  }
-  if (state.priceType === 1 || state.priceType === 0) {
-    params.priceType = state.priceType
   }
+  // if (state.type) {
+  //   params.type = state.type
+  // }
+  // if (state.sales === 0) {
+  //   params.sales = state.sales
+  // }
+  // // console.log(state.is_new)
+  // if (state.is_new === 0) {
+  //   params.is_new = state.is_new
+  // }
+  // if (state.priceType === 1 || state.priceType === 0) {
+  //   params.priceType = state.priceType
+  // }
   if (action === 'reload') {
     params.pageNum = 1
   }
   searchProductList({
-    ...params
+    ...params,
+    ...state.params
   }).then(res => {
-    state.triggered = false
-    if (action === 'page') {
-      productList.value = productList.value.contact(res.pageInfo.list)
-    }
-    if (action === 'reload') {
-      productList.value = res.pageInfo.list
-    }
-    console.log(res.pageInfo)
-    state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
-    state.status = 'more'
-
-
-    if (callback) {
-      callback(res.pageInfo.list)
+    console.log(res)
+    if (res && res.pageInfo) {
+      state.triggered = false
+      if (action === 'page') {
+        productList.value = productList.value.contact(res.pageInfo.list)
+      }
+      if (action === 'reload') {
+        productList.value = res.pageInfo.list
+      }
+      console.log(res.pageInfo)
+      state.totalPage = Math.ceil(res.pageInfo.total / state.pageSize);
+      state.status = 'more'
+
+
+      if (callback) {
+        callback(res.pageInfo.list)
+      }
     }
+  }).catch(error => {
+    uni.showToast({
+      title: error,
+      icon: "none"
+    })
   })
 }
 const navList = [{

src/pages/store/nearby/index.vue

@@ -179,13 +179,13 @@ function handleScrollToLower() {
     </template>
   </nut-searchbar>
 
-  <div class="flex">
+  <div class="flex ">
     <!-- 左侧 一级分类 -->
-    <div>
+    <div class="w-1/4">
       <scroll-view
           :scroll-y="true"
           :style="{ height: `${state.scrollHeight}px` }"
-          class="w-25 h-full bg-[#f8f8f8]"
+          class="w-full h-full bg-[#f8f8f8]"
       >
         <div
             @tap="loadAll()"
@@ -215,8 +215,8 @@ function handleScrollToLower() {
     </div>
 
 
-    <div class="w-full">
-      <div class="fixed z-3 flex flex-col justify-center h-10">
+    <div class="w-3/4">
+      <div class="fixed z-3 flex flex-col justify-center h-10 pl-3">
         <nut-menu>
           <nut-menu-item v-model="state.menuDefaultValue"
                          :options="state.options"
@@ -288,7 +288,6 @@ style:
 
 <style lang="scss">
 page {
-
   --nut-menu-item-font-size: 14px;
   --nut-menu-bar-line-height: 24px;
   --nut-menu-bar-box-shadow: none;