Merge branch 'ch-h5' into zzx

src/api/apiDefinitions.ts

@@ -44,8 +44,8 @@ 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':['GET', '/smqjh-system/app-api/v1/points/getPointsUserRecord'], //积分明细新接口
+  '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'],

src/config/index.ts

@@ -14,7 +14,7 @@ const mapEnvVersion = {
   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',
+  develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

src/subPack-common/integral/index.vue

@@ -35,6 +35,7 @@ getNavList()
 
 const PointsExpiryDate = ref()
 async function openPointsPopup() {
+  return
   showPointsPopup.value = true
   const res = await Apis.xsb.getUserPointsExpiryDate({})
   PointsExpiryDate.value = res.data || ''
@@ -86,12 +87,13 @@ async function openPointsPopup() {
       <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.businessScene}-${item.pointsActionType}` || '未知状态' }}
+            <!-- {{ `${item.businessScene}-${item.pointsActionType}` || '未知状态' }} -->
+            {{ item.businessTypeName || '未知状态' }}
           </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?.updateTime }}</view>
           <view>当前可用积分 {{ item?.currentlyAvailablePoints || 0 }}</view>

src/subPack-videoRights/commonTab/components/home.vue

@@ -36,7 +36,8 @@ function submitSearch() {
   if (productName.value === '') {
     return show({ msg: '搜索内容不能为空' })
   }
-  refresh()
+  page.value = 1
+  reload()
 }
 
 function clearSearch() {

src/subPack-videoRights/videoRightsSubmitOrder/videoRightsSubmitOrder.vue

@@ -87,7 +87,7 @@ function submitPay() {
       useGlobalLoading().loading({ msg: '提交中...' })
       const res = await Apis.videoRight.orderCreate({ data: submitFrom.value })
       useGlobalLoading().close()
-      const orderNumber = res.data?.orderNo as string
+      const orderNumber = res.data as unknown as string
       const payMent = await useUserStore().getPayMent(orderNumber)
       if (payMent.payType !== 'point') {
         try {