Merge branch 'master' of http://git.zonelife.cn:3000/zhangtao/city-gather

.vscode/settings.json

@@ -52,5 +52,6 @@
   "explorer.fileNesting.enabled": true,
   "explorer.fileNesting.patterns": {
     "vite.config.*": "pages.config.*, manifest.config.*, uno.config.*, volar.config.*, *.env, .env.*, alova.config.*"
-  }
+  },
+  "i18n-ally.localesPaths": []
 }

src/config/index.ts

@@ -7,13 +7,13 @@ const mapEnvVersion = {
   // 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.217:8080', // 黄
+  develop: 'http://192.168.0.217:8080', // 黄
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
   // develop: 'http://47.109.84.152:8081',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
-  develop: 'https://smqjh.api.zswlgz.com',
+  // develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

src/pages.json

@@ -278,6 +278,14 @@
     {
       "root": "subPack-smqjh",
       "pages": [
+        {
+          "path": "bannerDetaile/index",
+          "name": "bannerDetaile",
+          "islogin": false,
+          "style": {
+            "navigationBarTitleText": "详情"
+          }
+        },
         {
           "path": "order/index",
           "name": "smqjh-order",

src/pages/index/index.vue

@@ -60,8 +60,9 @@ const navList = computed(() => {
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: 'film-index', show: true },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: 'video-rights-tabbar', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-djk.png`, title: '大健康', name: 'djk-homeTabbar', show: true },
+    { icon: `${StaticUrl}/smqjh-jiayou.png`, title: '加油', name: 'refueling-tabbar', show: true }, // refueling-tabbar
+
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },
-    { icon: `${StaticUrl}/smqjh-jiayou.png`, title: '加油', name: '', show: !isOnlineAudit.value }, // refueling-tabbar
     { icon: `${StaticUrl}/smqjh-jiudian.png`, title: '酒店民宿', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-daijia.png`, title: '代驾', name: '', show: !isOnlineAudit.value },
   ]
@@ -116,7 +117,7 @@ async function getZhUserReceived() {
 }
 
 function handleGo() {
-  show({ msg: '敬请期待 !' })
+  router.push({ name: 'bannerDetaile' })
 }
 function handleChangeSwiper(e: UniHelper.SwiperOnChangeEvent) {
   console.log(e.detail.current, 'e.detail.current')
@@ -220,11 +221,11 @@ function handleChangeSwiper(e: UniHelper.SwiperOnChangeEvent) {
         </wd-skeleton>
       </view>
 
-      <view class="mt-20rpx w-full flex items-center justify-between" @click="handleGo">
+      <view class="mt-20rpx w-full flex items-center justify-between">
         <image :src="`${StaticUrl}/smqjh-fl.png`" class="h-346rpx w-344rpx flex-shrink-0" />
-        <view class="flex flex-1 flex-col items-end justify-center">
-          <image :src="`${StaticUrl}/smqjh-hot-vip.png`" class="h-180rpx w-344rpx" />
-          <image :src="`${StaticUrl}/smqjh-cd.png`" class="mt-14rpx h-152rpx w-344rpx" />
+        <view class="flex flex-1 flex-col items-end justify-center" @click="handleGo">
+          <image :src="`${StaticUrl}/smqjh-home-banner1.jpg`" class="h-180rpx w-344rpx rounded-12rpx" />
+          <image :src="`${StaticUrl}/smqjh-home-banner2.jpg`" class="mt-14rpx h-152rpx w-344rpx rounded-12rpx" />
         </view>
       </view>
       <view class="mt-20rpx">

src/subPack-refueling/webView/index.vue

@@ -3,10 +3,10 @@ definePage({
   name: 'refueling-webview',
   islogin: false,
   style: {
-    navigationBarTitleText: '支付',
+    navigationBarTitleText: '',
   },
 })
-const url = ref('https://smqjh.admin.zswlgz.com/test.html')
+const url = ref('https://smqjh.ddjy.zswlgz.com')
 </script>
 
 <template>

src/subPack-smqjh/bannerDetaile/index.vue

@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import { StaticUrl } from '@/config'
+
+definePage({ name: 'bannerDetaile', islogin: false, style: { navigationBarTitleText: '详情' } })
+</script>
+
+<template>
+  <view class="box-border w-full p24rpx">
+    <image
+      :src="`${StaticUrl}/smqjh-dt.jpg`"
+      class="w-full"
+      mode="widthFix"
+    />
+  </view>
+</template>
+
+<style lang="scss" scoped></style>

src/uni-pages.d.ts

@@ -24,6 +24,7 @@ interface NavigateToOptions {
        "/subPack-common/revalue/index" |
        "/subPack-common/revalueSuccess/index" |
        "/subPack-common/user-center/index" |
+       "/subPack-smqjh/bannerDetaile/index" |
        "/subPack-smqjh/order/index" |
        "/subPack-film/choose-film/index" |
        "/subPack-film/choose-seat/index" |