2 年之前 · c5e10f39e7
--- a/package.json
+++ b/package.json
@@ -110,4 +110,4 @@
 
				   "uni-app": {
			
 
				     "scripts": {}
			
 
				   }
			
 
				-}
			
 
				+}
			
--- a/public/index.html
+++ b/public/index.html
@@ -11,8 +11,12 @@
 
				         var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
			
 
				         document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
			
 
				     </script>
			
 
				+    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
			
 
				+    <script>
			
 
				+        var vConsole = new window.VConsole();
			
 
				+    </script>
			
 
				     <link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
			
 
				-</head> 
			
 
				+</head>
			
 
				 
			
 
				 <body>
			
 
				     <noscript>
			
--- a/src/pages.json
+++ b/src/pages.json
@@ -154,7 +154,7 @@
 
				 			}
			
 
				 		},
			
 
				 		{
			
 
				-			// 后台运行保护指南
			
 
				+			// 后台运行保护协议
			
 
				 			"path": "pages/backgrounder/index",
			
 
				 			"style": {
			
 
				 				"navigationStyle": "custom"
			
--- a/src/pages/backgrounder/index.vue
+++ b/src/pages/backgrounder/index.vue
@@ -1,13 +1,35 @@
 
				 <template>
			
 
				+<<<<<<< HEAD
			
 
				   <div class="app-container"></div>
			
 
				+=======
			
 
				+  <view class="app-container">
			
 
				+
			
 
				+  </view>
			
 
				+>>>>>>> test
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 export default {
			
 
				+<<<<<<< HEAD
			
 
				   created() {
			
 
				     window.location.href = "https://ohplay.radio1964.net/guide"
			
 
				+=======
			
 
				+  data() {
			
 
				+    return {
			
 
				+
			
 
				+    }
			
 
				+  },
			
 
				+  created(){
			
 
				+    window.location.href = 'https://ohplay.radio1964.net/guide'
			
 
				+>>>>>>> test
			
 
				   }
			
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scoped></style>
			
 
				+<<<<<<< HEAD
			
 
				+<style lang="scss" scoped></style>
			
 
				+=======
			
 
				+<style lang="scss">
			
 
				+
			
 
				+</style>
			
 
				+>>>>>>> test
			
--- a/src/pages/vip/index.vue
+++ b/src/pages/vip/index.vue
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,4 +1,4 @@
 
				-const baseUrl = 'https://o3tapi.radio1964.com/web' // 付新保本地'
			
 
				+const baseUrl = 'https://o3tapi.radio1964.com/web' // 测试
			
 
				 
			
 
				 function request(e) {
			
 
				   if (!e.data) {