From 3162ec4e67f955a7e78cd26cbc9c3147c6ecdffd Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 25 Oct 2025 16:35:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A6=96=E9=A1=B5):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=9B=BE=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改环境变量为develop
- 新增webview页面用于处理外部链接跳转
- 实现轮播图点击跳转功能，支持内部路由和外部链接
- 替换旧版轮播图接口为新的AppletOrderBanner接口
- 更新pages.json添加webview页面配置
---
 api/order/AppletOrderBanner.js  | 10 ++++++++++
 pages.json                      |  9 +++++++++
 pages/index.vue                 | 44 ++++++++++++++++++++++++++++++++---------
 pages_order/webview/webview.vue | 26 ++++++++++++++++++++++++
 utils/getUrl.js                 |  2 +-
 5 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 api/order/AppletOrderBanner.js
 create mode 100644 pages_order/webview/webview.vue

diff --git a/api/order/AppletOrderBanner.js b/api/order/AppletOrderBanner.js
new file mode 100644
index 0000000..cef9eff
--- /dev/null
+++ b/api/order/AppletOrderBanner.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询轮播图列表
+export function listAppletBanner(query) {
+  return request({
+    url: '/applet/order/banner/list',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/pages.json b/pages.json
index fab88a9..0909dfd 100644
--- a/pages.json
+++ b/pages.json
@@ -463,6 +463,15 @@
 						"enablePullDownRefresh": false,
 						"navigationBarTextStyle": "white"
 					}
+				},
+				{
+					"path": "webview/webview",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#FFBF60",
+						"enablePullDownRefresh": false,
+						"navigationBarTextStyle": "white"
+					}
 				}
 			]
 		}
diff --git a/pages/index.vue b/pages/index.vue
index dc556e9..f91050f 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -7,8 +7,9 @@
 			<uni-swiper-dot class="uni-swiper-dot-box" field="content">
 				<swiper class="swiper" indicator-dots indicator-color="rgba(255, 255, 255, 0.50)"
 					indicator-active-color="#ffffff" autoplay interval="5000">
-					<swiper-item v-for="(item,i) in bannerList" :key="i">
-						<image :src="item&&item.dictValue" style="width: 100%;" mode="widthFix" />
+					<swiper-item v-for="(item,i) in bannerList" :key="i" @click="towebview(item)">
+						<image :src="item&&item.image" style="width: 100%;" mode="widthFix" />
+						<!-- <image :src="item&&item.dictValue" style="width: 100%;" mode="widthFix" /> -->
 					</swiper-item>
 				</swiper>
 			</uni-swiper-dot>
@@ -312,6 +313,7 @@
 
 <script>
 import { bindCode } from '@/api/order/order.js'
+import { listAppletBanner } from '@/api/order/AppletOrderBanner.js'
 	import {
 		getStaffList,
 		getProductList,
@@ -414,6 +416,20 @@ import { bindCode } from '@/api/order/order.js'
 			
 		// },
 		methods: {
+			towebview(item){
+                if(!item.url){
+                    return
+                }
+                if(item.url.indexOf('https://') === 0 || item.url.indexOf('http://') === 0){
+                    uni.navigateTo({
+                        url: '/pages_order/webview/webview?url=' + encodeURIComponent(item.url)
+                    })
+                    return
+                }
+                uni.navigateTo({
+                    url: item.url
+                })
+			},
 			closeNewUserPopup() {
 				this.isNewUser = false;
 			},
@@ -755,13 +771,23 @@ import { bindCode } from '@/api/order/order.js'
 			},
 			redirectuser() {},
 			getBanner() {
-				getBannerList().then(res => {
-					if (res.code == 200) {
-						this.bannerList = res.data
-					} else {
-						this.$modal.showToast('获取Banner失败')
-					}
-				})
+				// getBannerList().then(res => {
+				// 	if (res.code == 200) {
+				// 		this.bannerList = res.data
+				// 	} else {
+				// 		this.$modal.showToast('获取Banner失败')
+				// 	}
+				// })
+                listAppletBanner({
+                    pageNum: 1,
+                    pageSize: 9999999,
+                }).then(res => {
+                    if (res.code == 200) {
+                        this.bannerList = res.data.records
+                    } else {
+                        this.$modal.showToast('获取Banner失败')
+                    }
+                })
 			},
 			changeSwiper(e) {
 				this.current = e.detail.current
diff --git a/pages_order/webview/webview.vue b/pages_order/webview/webview.vue
new file mode 100644
index 0000000..da0159c
--- /dev/null
+++ b/pages_order/webview/webview.vue
@@ -0,0 +1,26 @@
+<template>
+	<view>
+		<!-- <web-view src="https://mp.weixin.qq.com/s/E3P7LocvLcklX2HIxblnsg"></web-view> -->
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: ''
+			}
+		},
+        onLoad(options) {
+            this.url = decodeURIComponent(options.url)
+        },
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/utils/getUrl.js b/utils/getUrl.js
index 7f40537..fa9c188 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -1,4 +1,4 @@
-let current ="release";
+let current ="trial";
 const accountInfo = wx.getAccountInfoSync();
 
 // current = accountInfo.miniProgram.envVersion;