mod(custom): \!

.drone.yml

@@ -2,14 +2,10 @@ kind: pipeline
 type: docker
 name: default
 
-platform:
-  os: linux
-  arch: amd64
-
 steps:
   - name: 测试服-依赖安装&&编译打包
     pull: if-not-exists
-    image: node:20-alpine
+    image: node:20
     when:
       branch:
         - test
@@ -24,7 +20,7 @@ steps:
 
   - name: 正式服-依赖安装&&编译打包
     pull: if-not-exists
-    image: node:20-alpine
+    image: node:20
     when:
       branch:
         - master
@@ -32,7 +28,7 @@ steps:
       - npm config set registry https://registry.npmmirror.com/
       - npm install -g pnpm
       - pnpm install
-      - pnpm build:h5:prod
+      - pnpm build:h5
       - rm -rf dist.tar
       - rm -rf node_modules
       - tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile
@@ -77,14 +73,8 @@ steps:
         - rm -rf dist.tar
         - cd jdt-tz-dev
         - docker build -t jdt-tz-dev .
-        - target_container="jdt-tz-dev"
-        - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then
-        - echo "容器存在，执行操作..."
         - docker stop jdt-tz-dev
         - docker rm jdt-tz-dev
-        - else
-        - echo "容器不存在"
-        - fi
         - docker run -d -p 8283:80 --restart=always --name jdt-tz-dev jdt-tz-dev
         - cd ..
         - rm -rf jdt-tz-dev
@@ -94,7 +84,7 @@ steps:
     image: appleboy/drone-scp
     when:
       branch:
-        - main
+        - master
     settings:
       host:
         from_secret: HOST_PROD
@@ -113,7 +103,7 @@ steps:
     image: appleboy/drone-ssh
     when:
       branch:
-        - main
+        - master
     settings:
       host:
         from_secret: HOST_PROD
@@ -128,15 +118,9 @@ steps:
         - tar -xzvf dist.tar -C /www/builder/jdt-tz-prod
         - rm -rf dist.tar
         - cd jdt-tz-prod
-        - cd docker build -t jdt-tz-prod .
+        - docker build -t jdt-tz-prod .
-        - target_container="jdt-tz-prod"
-        - if docker ps -a --format '{{.Names}}' | grep -q "^$target_container$"; then
-        - echo "容器存在，执行操作..."
         - docker stop jdt-tz-prod
         - docker rm jdt-tz-prod
-        - else
-        - echo "容器不存在"
-        - fi
         - docker run -d -p 8283:80 --restart=always --name jdt-tz-prod jdt-tz-prod
         - cd ..
         - rm -rf jdt-tz-prod
@@ -147,7 +131,7 @@ steps:
     when:
       branch:
         - test
-        - main
+        - master
       status:
         - success
         - failure

.idea/.gitignore

@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/codeStyles/Project.xml

@@ -0,0 +1,62 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

.idea/jdt-game.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-game.iml" filepath="$PROJECT_DIR$/.idea/jdt-game.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package.json

@@ -13,7 +13,7 @@
 		"build:swan": "taro build --type swan",
 		"build:alipay": "taro build --type alipay",
 		"build:tt": "taro build --type tt",
-		"build:h5:prod": "taro build --type h5",
+		"build:h5": "taro build --type h5",
 		"build:h5:test": "taro build --type h5 --mode test",
 		"build:rn": "taro build --type rn",
 		"build:qq": "taro build --type qq",
@@ -56,19 +56,19 @@
 	"author": "",
 	"dependencies": {
 		"@babel/runtime": "^7.22.11",
-		"@tarojs/components": "3.6.22",
+		"@tarojs/components": "3.6.34",
-		"@tarojs/helper": "3.6.22",
+		"@tarojs/helper": "3.6.34",
-		"@tarojs/plugin-framework-vue3": "3.6.22",
+		"@tarojs/plugin-framework-vue3": "3.6.34",
-		"@tarojs/plugin-platform-alipay": "3.6.22",
+		"@tarojs/plugin-platform-alipay": "3.6.34",
-		"@tarojs/plugin-platform-h5": "3.6.22",
+		"@tarojs/plugin-platform-h5": "3.6.34",
-		"@tarojs/plugin-platform-jd": "3.6.22",
+		"@tarojs/plugin-platform-jd": "3.6.34",
-		"@tarojs/plugin-platform-qq": "3.6.22",
+		"@tarojs/plugin-platform-qq": "3.6.34",
-		"@tarojs/plugin-platform-swan": "3.6.22",
+		"@tarojs/plugin-platform-swan": "3.6.34",
-		"@tarojs/plugin-platform-tt": "3.6.22",
+		"@tarojs/plugin-platform-tt": "3.6.34",
-		"@tarojs/plugin-platform-weapp": "3.6.22",
+		"@tarojs/plugin-platform-weapp": "3.6.34",
-		"@tarojs/runtime": "3.6.22",
+		"@tarojs/runtime": "3.6.34",
-		"@tarojs/shared": "3.6.22",
+		"@tarojs/shared": "3.6.34",
-		"@tarojs/taro": "3.6.22",
+		"@tarojs/taro": "3.6.34",
 		"dayjs": "^1.11.10",
 		"lottie-web": "^5.12.2",
 		"vue": "^3.3.4"
@@ -77,10 +77,10 @@
 		"@babel/core": "^7.22.11",
 		"@commitlint/cli": "^18.2.0",
 		"@commitlint/config-conventional": "^18.1.0",
-		"@tarojs/cli": "3.6.22",
+		"@tarojs/cli": "3.6.34",
-		"@tarojs/taro-loader": "3.6.22",
+		"@tarojs/taro-loader": "3.6.34",
 		"@tarojs/test-utils-vue3": "^0.1.1",
-		"@tarojs/webpack5-runner": "3.6.22",
+		"@tarojs/webpack5-runner": "3.6.34",
 		"@types/jest": "^29.5.4",
 		"@types/node": "^20.5.7",
 		"@types/webpack-env": "^1.18.1",
@@ -88,12 +88,12 @@
 		"@typescript-eslint/parser": "^6.5.0",
 		"@vue/babel-plugin-jsx": "^1.1.5",
 		"@vue/compiler-sfc": "^3.3.4",
-		"babel-preset-taro": "3.6.22",
+		"babel-preset-taro": "3.6.34",
 		"commitizen": "^4.3.0",
 		"css-loader": "6.8.1",
 		"cz-customizable": "^7.0.0",
 		"eslint": "^8.48.0",
-		"eslint-config-taro": "3.6.22",
+		"eslint-config-taro": "3.6.34",
 		"eslint-plugin-vue": "^9.17.0",
 		"husky": "^8.0.0",
 		"jest": "^29.6.4",
@@ -107,5 +107,6 @@
 		"typescript": "^5.2.2",
 		"vue-loader": "^17.2.2",
 		"webpack": "5.88.2"
-	}
+	},
+	"packageManager": "pnpm@9.1.4+sha512.9df9cf27c91715646c7d675d1c9c8e41f6fce88246f1318c1aa6a1ed1aeb3c4f032fcdf4ba63cc69c4fe6d634279176b5358727d8f2cc1e65b65f43ce2f8bfb0"
 }

src/app.config.ts

@@ -1,6 +1,7 @@
 export default defineAppConfig({
   pages: [
     'pages/index/index',
+    'pages/webview/index',
     'pages/yaotouzi/index/index',
     'pages/game_detail/index',
     'pages/yaotouzi/records/index',
@@ -16,6 +17,5 @@ export default defineAppConfig({
     navigationBarBackgroundColor: '#fff',
     navigationBarTitleText: 'Game',
     navigationBarTextStyle: 'black',
-    },
+  }
-    animation: false,
 })

src/pages/game_detail/index.vue

@@ -28,8 +28,16 @@ Taro.useLoad(() => {
 })
 
 const startGame = () => {
+  // 判断url中是否含有http
+  if (info.value.url.indexOf('http') === -1) {
     Taro.navigateTo({
       url: info.value.url,
     })
+  } else {
+    Taro.setStorageSync("url", `${info.value.url}?uid=${Taro.getStorageSync('uid')}&game_id=${info.value.ID}`)
+    Taro.navigateTo({
+      url: `/pages/webview/index`,
+    })
+  }
 }
 </script>

src/pages/index/index.vue

@@ -42,7 +42,7 @@ const getList = async () => {
         url: `${process.env.TARO_APP_HOME}`,
         method: 'POST',
         success: ({ data: res }) => {
-            list.value = res.data.data || []
+            list.value = res.data.data.sort((a: any, b: any) => b.sort - a.sort) || []
         },
     })
 }

src/pages/turntable/index/index.vue

@@ -40,7 +40,7 @@ const user_info = ref<{
 const bet_options = ref([
   {
     id: 1,
-    name: 600,
+    name: 100,
   },
   {
     id: 2,

src/pages/webview/index.config.ts

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '',
+})

src/pages/webview/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <view>
+    <web-view :src="src" />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import Taro from '@tarojs/taro'
+
+const src = ref('')
+
+Taro.useLoad((e) => {
+  src.value = Taro.getStorageSync("url")
+})
+</script>
+
+<style lang="scss"></style>