chore(config): 注释掉 develop 环境下的链接地址

- 将 develop 环境的 https 链接注释，保留测试代理地址
- 方便环境切换和调试
- 保持代码配置清晰明确

src/api/apiDefinitions.ts

@@ -44,7 +44,9 @@ export default {
   'xsb.categories':['GET', '/smqjh-pms/app-api/v1/categories'],
   'xsb.getCategoryProductList':['POST', '/smqjh-pms/app-api/v1/spu/getCategoryProductList'],
   'xsb.getProductDetail':['GET', '/smqjh-pms/app-api/v1/spu/getProductDetails'],
-  'xsb.findUserPointsPage':['PUT', '/smqjh-system/app-api/v1/points/findUserPointsPage'],
+  // 'xsb.findUserPointsPage':['PUT', '/smqjh-system/app-api/v1/points/findUserPointsPage'], //积分明细老接口
+  'xsb.findUserPointsPage':['GET', '/smqjh-system/app-api/v1/points/getPointsUserRecord'], //积分明细新接口
+  'xsb.getUserPointsExpiryDate':['GET', '/smqjh-system/app-api/v1/points/getUserPointsExpiryDate'],
   'xsb.findUserPoints':['GET', '/smqjh-system/app-api/v1/points/findUserPoints'],
   'xsb.getSearchProductList':['POST', '/smqjh-pms/app-api/v1/spu/getSearchProductList'],
   'xsb.appAdvertInfo':['GET', '/smqjh-system/app-api/v1/appAdvertInfo'],

src/api/globals.d.ts

@@ -496,6 +496,13 @@ declare global {
       >(
         config: Config
       ): Alova2Method<listData<Api.xsbFindUserPointsPage>, 'xsb.findUserPointsPage', Config>;
+
+      getUserPointsExpiryDate<
+        Config extends Alova2MethodConfig<listData<any>> & {}
+      >(
+        config: Config
+      ): Alova2Method<listData<any>, 'xsb.getUserPointsExpiryDate', Config>;
+
       getSearchProductList<
         Config extends Alova2MethodConfig<listData<Api.xsbCategoryProductList>> & {
           data: {

src/config/index.ts

@@ -6,12 +6,12 @@ const mapEnvVersion = {
   // develop: 'http://192.168.1.101:8080',
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
-  // develop: 'http://192.168.0.19:8080', // 邓
+  develop: 'http://192.168.0.19:8080', // 邓
   // develop: 'http://192.168.1.20:8080', // 黄
   // develop: 'http://192.168.0.11:8081', // 王
   // develop: 'http://192.168.1.21:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  develop: 'http://47.109.84.152:8081', // 测试代理
+  // develop: 'http://47.109.84.152:8081', // 测试代理
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://25740642.r3.cpolar.top',
   // develop: 'https://smqjh.api.zswlgz.com',
@@ -20,10 +20,10 @@ const mapEnvVersion = {
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  // trial: 'http://47.109.84.152:8081',
+  trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.0.11:8081', // 王
   // trial: 'http://192.168.1.166:8080,
-  trial: 'https://smqjh.api.zswlgz.com',
+  // trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

src/subPack-common/integral/index.vue

@@ -15,6 +15,9 @@ const { data: info } = useRequest(() =>
   Apis.xsb.findUserPoints({}),
 )
 
+onMounted(() => {
+})
+
 const { data: pointList, isLastPage, page } = usePagination((pageNum, pageSize) => Apis.xsb.findUserPointsPage({ data: { pageNum, pageSize } }), { data: resp => resp.data?.list, initialPage: 1, initialPageSize: 10, immediate: true, append: true })
 
 function handleScrollBottom() {
@@ -29,6 +32,13 @@ async function getNavList() {
   navTabTypeList.value = res.data?.list || []
 }
 getNavList()
+
+const PointsExpiryDate = ref()
+async function openPointsPopup() {
+  showPointsPopup.value = true
+  const res = await Apis.xsb.getUserPointsExpiryDate({})
+  PointsExpiryDate.value = res.data || ''
+}
 </script>
 
 <template>
@@ -42,7 +52,7 @@ getNavList()
           {{ info?.data?.pointsTotal || 0 }}
         </view>
       </view>
-      <view class="flex flex-col items-center justify-center" @click="showPointsPopup = true">
+      <view class="flex flex-col items-center justify-center" @click="openPointsPopup">
         <view class="text-28rpx text-[#AAAAAA]">
           当前可用积分
         </view>
@@ -76,21 +86,21 @@ getNavList()
       <view v-for="(item, index) in pointList" :key="item.pointsId" class="bg-white p-24rpx">
         <view class="flex items-center justify-between text-32rpx font-semibold">
           <view class="text-[#222]">
-            {{ item.businessTypeName || '未知状态' }}
+            {{ `${item.businessScene}-${item.pointsActionType}` || '未知状态' }}
           </view>
           <view class="text-[#FF4A39]">
             {{ item?.pointsTypeName }}{{ item?.variablePoints || 0 }}
           </view>
-        </view>
+        </view>+
         <view class="mt-20rpx flex items-center justify-between text-28rpx text-[#AAAAAA]">
-          <view>{{ item?.creationDate }}</view>
+          <view>{{ item?.updateTime }}</view>
           <view>当前可用积分 {{ item?.currentlyAvailablePoints || 0 }}</view>
         </view>
         <view v-if="index < pointList.length - 1" class="mt-24rpx h-2rpx w-full bg-[#F0F0F0]" />
       </view>
       <StatusTip v-if="!pointList.length" tip="暂无内容" />
     </scroll-view>
-    <!-- <Zpopup v-model="showPointsPopup" :showfooter="false" bg="#fff">
+    <Zpopup v-model="showPointsPopup" :showfooter="false" bg="#fff">
       <view class="px-32rpx pb-40rpx pt-40rpx">
         <view class="mb-32rpx text-center text-32rpx font-bold">
           积分有限期
@@ -103,20 +113,12 @@ getNavList()
             {{ info?.data?.availablePointsTotal || 0 }}
           </view>
         </view>
-        <view class="mb-16rpx flex items-center justify-between">
-          <view class="text-24rpx text-[#999]">
-            有效期至：2026-07-06 23:59:59
-          </view>
-          <view class="text-24rpx text-[#222]">
-            2000
-          </view>
-        </view>
-        <view class="mb-32rpx flex items-center justify-between">
+        <view v-for="(item, index) in PointsExpiryDate" :key="index" class="mb-16rpx flex items-center justify-between">
           <view class="text-24rpx text-[#999]">
-            有效期至：2026-07-06 23:59:59
+            有效期至：{{ item.expiryDate }}
           </view>
           <view class="text-24rpx text-[#222]">
-            700
+            {{ item.availablePointsTotal }}
           </view>
         </view>
         <view class="mb-32rpx h-2rpx w-full bg-[#F0F0F0]" />
@@ -129,7 +131,7 @@ getNavList()
           <view>3.如若交易在使用的积分有效期之外发生退款，该部分积分也为过期。</view>
         </view>
       </view>
-    </Zpopup> -->
+    </Zpopup>
   </view>
 </template>
 

src/subPack-film/submit-order/index.vue

@@ -109,16 +109,16 @@ async function pay() {
     const payMent = await useUserStore().getPayMent(orderNumber)
     if (payMent.payType !== 'point') {
       try {
-        // // #ifdef MP-WEIXIN
-        // const res = await useUserStore().handleCommonPayMent(orderNumber)
-        // await useUserStore().getWxCommonPayment(res)
-        // await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
-        // // #endif
-        // // #ifdef H5
-        // useUserStore().handleCommonWechatPay(orderNumber)
-        // await handleH5PayResult(orderNumber)
-        // // #endif
-        useGlobalToast().show('暂不支持微信支付')
+        // #ifdef MP-WEIXIN
+        const res = await useUserStore().handleCommonPayMent(orderNumber)
+        await useUserStore().getWxCommonPayment(res)
+        await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
+        // #endif
+        // #ifdef H5
+        useUserStore().handleCommonWechatPay(orderNumber)
+        await handleH5PayResult(orderNumber)
+        // #endif
+        // useGlobalToast().show('暂不支持微信支付')
       }
       catch {
         await useUserStore().payError('film-order', 'subPack-film/index/index')
@@ -136,14 +136,14 @@ async function pay() {
     loading.value = false
   }
 }
-// async function handleH5PayResult(orderNumber: string) {
-//   const isPaySuccess = await useUserStore().pollOrderPaySuccess(orderNumber)
-//   if (isPaySuccess) {
-//     await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
-//     return
-//   }
-//   useGlobalToast().show({ msg: '暂未查询到支付成功，请稍后在订单列表查看' })
-// }
+async function handleH5PayResult(orderNumber: string) {
+  const isPaySuccess = await useUserStore().pollOrderPaySuccess(orderNumber)
+  if (isPaySuccess) {
+    await useUserStore().paySuccess('film-order', 'subPack-film/index/index')
+    return
+  }
+  useGlobalToast().show({ msg: '暂未查询到支付成功，请稍后在订单列表查看' })
+}
 function call() {
   uni.makePhoneCall({
     phoneNumber: info.value.phone,

src/subPack-smqjh/components/film-orderList/film-orderList.vue

@@ -12,14 +12,14 @@ const _emit = defineEmits<{
 async function handlePay(orderNumber: string) {
   const payMent = await useUserStore().getPayMent(orderNumber)
   if (payMent?.payType !== 'point' && payMent) {
-    // // #ifdef MP-WEIXIN
-    // const res = await useUserStore().handleCommonPayMent(orderNumber)
-    // await useUserStore().getWxCommonPayment(res)
-    // _emit('refresh')
-    // // #endif
-    // // #ifdef H5
-    // useUserStore().handleCommonWechatPay(orderNumber)
-    // // #endif
+    // #ifdef MP-WEIXIN
+    const res = await useUserStore().handleCommonPayMent(orderNumber)
+    await useUserStore().getWxCommonPayment(res)
+    _emit('refresh')
+    // #endif
+    // #ifdef H5
+    useUserStore().handleCommonWechatPay(orderNumber)
+    // #endif
   }
   else {
     await useUserStore().handleCommonPayMent(orderNumber)