1
0

11 Revīzijas bc5d2d373b ... ede0a664db

Autors SHA1 Ziņojums Datums
  zouzexu ede0a664db ``` 2 dienas atpakaļ
  zouzexu 6ed6b6269e ``` 2 dienas atpakaļ
  zouzexu 35fba20354 Merge remote-tracking branch 'origin/master' into zzx 2 dienas atpakaļ
  zouzexu ef8f49edb0 ``` 2 dienas atpakaļ
  zouzexu 59cbb25639 Merge remote-tracking branch 'origin/master' into zzx 2 dienas atpakaļ
  zouzexu bd68bf083f ``` 2 dienas atpakaļ
  zouzexu 01d02d1b18 Merge branch 'master' into zzx 3 dienas atpakaļ
  zouzexu 7e5fb2f336 ``` 3 dienas atpakaļ
  zouzexu 5b1df576cd Merge remote-tracking branch 'origin/master' into zzx 3 dienas atpakaļ
  zouzexu 6379ced388 ``` 3 dienas atpakaļ
  zouzexu e634318f2a ``` 4 dienas atpakaļ

+ 1 - 0
src/api/apiDefinitions.ts

@@ -64,6 +64,7 @@ export default {
   'xsb.refundList':['POST', '/smqjh-oms/app-api/v1/refund/findList'],
   'xsb.refundCancel':['GET', '/smqjh-oms/app-api/v1/refund/cancel'],
   'xsb.refundDetails':['GET', '/smqjh-oms/app-api/v1/refund/findByDetails'],
+  'xsb.popupConfig':['GET', '/smqjh-system/app-api/v1/appAdvertInfo/popupConfig'],
 
   'common.myShoppingCart':['GET', '/smqjh-oms/app-api/v1/shoppingCart/myShoppingCart'],
   'common.addShoppingCart':['POST', '/smqjh-oms/app-api/v1/shoppingCart/addShoppingCart'],

+ 6 - 0
src/api/globals.d.ts

@@ -205,6 +205,12 @@ declare global {
       ): Alova2Method<listData<Api.sysDict>, 'sys.dictPage', Config>;
     }
     xsb: {
+      popupConfig<
+        Config extends Alova2MethodConfig<apiResData<any>> & { }
+      >(
+        config: Config
+      ): Alova2Method<apiResData<any>, 'xsb.popupConfig', Config>;
+
       refundDetails<
         Config extends Alova2MethodConfig<apiResData<Api.OrderRefundDetails>> & {
           data: {

+ 2 - 2
src/config/index.ts

@@ -19,9 +19,9 @@ 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.1.166:8080',
-  trial: 'https://smqjh.api.zswlgz.com',
+  // trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

+ 1 - 0
src/pages/index/index.vue

@@ -101,6 +101,7 @@ async function getZhUserReceived() {
   await Apis.sys.zhUserReceived({})
   useGlobalLoading().close()
   show({ msg: '领取成功 !' })
+  showoverlay.value = false
 }
 
 function handleGo() {

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

@@ -56,27 +56,27 @@ function clearSearch() {
     <view class="box-border px24rpx">
       <scroll-view scroll-y type="custom">
         <grid-view type="masonry" cross-axis-count="2" main-axis-gap="10" cross-axis-gap="10">
-          <view v-for="item in videoDataList" :key="item.id" class="mt-18rpx rounded-16rpx bg-#FFF" @click="router.push({ name: 'video-rights-detail', params: { id: item.id } })">
+          <view v-for="item in videoDataList" :key="item?.id" class="mt-18rpx rounded-16rpx bg-#FFF" @click="router.push({ name: 'video-rights-detail', params: { id: item.id } })">
             <view>
               <image
                 class="h-342rpx w-342rpx rounded-16rpx"
-                :src="`${StaticUrl}/list-page-img.png`"
+                :src="item.productImg ? item.productImg : `${StaticUrl}/list-page-img.png`"
               />
             </view>
             <view class="mx20rpx my-24rpx">
               <view class="text-28rpx font-bold">
                 {{ item.productName }}
               </view>
-              <view class="mt-30rpx flex items-center gap-18rpx">
+              <view class="mt-30rpx flex items-center justify-between">
                 <view class="text-#FF4D3A">
                   <text class="text-22rpx font-500">
                   </text>
-                  <text class="text-36rpx font-800">
+                  <text class="text-34rpx font-800">
                     {{ item.price }}
                   </text>
                 </view>
-                <view class="text-24rpx text-#AAA decoration-line-through">
+                <view class="text-22rpx text-#AAA decoration-line-through">
                   市场价¥{{ item.faceValue }}
                 </view>
               </view>

+ 1 - 1
src/subPack-xsb/commonTab/components/index.vue

@@ -196,7 +196,7 @@ function handleChangeSwiper(e: UniHelper.SwiperOnChangeEvent) {
                 </view>
 
                 <view v-if="swiperClassList.length" class="swiper-img swiper mt26rpx">
-                  <swiper class="h125rpx gap-16rpx" display-multiple-items="5" @change="handleChangeSwiper">
+                  <swiper class="h125rpx gap-16rpx" :display-multiple-items="5" @change="handleChangeSwiper">
                     <swiper-item v-for="item, idx in swiperClassList" :key="item.id" class="mb20rpx flex flex-col items-center text-center" @click="handleSwiperClick({ index: idx, item })">
                       <view class="pic-box">
                         <image class="h72rpx w72rpx" :src="item.icon" />

+ 22 - 0
src/subPack-xsb/commonTab/index.vue

@@ -91,6 +91,7 @@ onMounted(async () => {
   // reload()
   getCategories()
   loading.value = false
+  queryPopupConfig()
 })
 onShow(() => refresh())
 
@@ -134,6 +135,22 @@ function beforeleave() {
     })
   }
 }
+
+const curtainInfo = ref({
+  enabled: false,
+  imageUrl: '',
+})
+
+async function queryPopupConfig() {
+  try {
+    const res = await Apis.xsb.popupConfig({})
+    curtainInfo.value = res.data
+  }
+  catch (error) {
+    console.error('获取弹窗配置失败:', error)
+    curtainInfo.value = { enabled: false, imageUrl: '' }
+  }
+}
 </script>
 
 <template>
@@ -191,6 +208,11 @@ function beforeleave() {
         </view>
       </view>
     </wd-popup>
+    <wd-overlay :show="curtainInfo.enabled" :z-index="99999" @click="curtainInfo.enabled = false">
+      <view class="h-full flex items-center justify-center">
+        <image class="h-784rpx w-750rpx" :src="curtainInfo.imageUrl" />
+      </view>
+    </wd-overlay>
   </view>
 </template>