diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index cfa2c6b..46bc301 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -40,7 +40,7 @@ jobs: run: | set -euo pipefail SHORT_SHA="$(printf '%.12s' "$GITHUB_SHA")" - docker build -t "${IMAGE}:pro" -t "${IMAGE}:${SHORT_SHA}" . + docker build --build-arg VITE_CUSTOMER_SERVICE_PROVIDER=third_party -t "${IMAGE}:pro" -t "${IMAGE}:${SHORT_SHA}" . docker push "$IMAGE:pro" docker push "$IMAGE:$SHORT_SHA" diff --git a/Dockerfile b/Dockerfile index e843d59..c373994 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,9 @@ RUN corepack enable COPY web/package.json web/pnpm-lock.yaml web/pnpm-workspace.yaml ./ RUN pnpm install --frozen-lockfile COPY web/ ./ +ARG VITE_CUSTOMER_SERVICE_PROVIDER= ENV VITE_PUBLIC_PATH=/ +ENV VITE_CUSTOMER_SERVICE_PROVIDER=${VITE_CUSTOMER_SERVICE_PROVIDER} RUN pnpm run build # ---- Stage 2: build the Go backend ---- diff --git a/tests/test_actions_workflow.py b/tests/test_actions_workflow.py index 15f4c16..b6fc031 100644 --- a/tests/test_actions_workflow.py +++ b/tests/test_actions_workflow.py @@ -21,6 +21,12 @@ class DeployWorkflowContractTest(unittest.TestCase): self.assertIn("git.olns.shop/pro/olons_server", self.workflow) self.assertIn("docker push", self.workflow) self.assertIn(":pro", self.workflow) + self.assertIn("--build-arg VITE_CUSTOMER_SERVICE_PROVIDER=third_party", self.workflow) + + def test_production_image_enables_customer_service_widget(self): + dockerfile = (WORKFLOW.parents[2] / "Dockerfile").read_text(encoding="utf-8") + self.assertIn("ARG VITE_CUSTOMER_SERVICE_PROVIDER=", dockerfile) + self.assertIn("ENV VITE_CUSTOMER_SERVICE_PROVIDER=${VITE_CUSTOMER_SERVICE_PROVIDER}", dockerfile) def test_deploys_compose_service_with_pinned_host_key(self): self.assertIn("DEPLOY_SSH_KEY", self.workflow) @@ -53,4 +59,3 @@ class DeployWorkflowContractTest(unittest.TestCase): if __name__ == "__main__": unittest.main() - diff --git a/web/src/mobile/views/SupportView.vue b/web/src/mobile/views/SupportView.vue index e59cbb0..2900e9d 100644 --- a/web/src/mobile/views/SupportView.vue +++ b/web/src/mobile/views/SupportView.vue @@ -16,7 +16,7 @@ v-for="item in services" :key="item.id" class="m-service-card" - @click="$router.push(`/app/support/${item.id}`)" + @click="openService(item)" >
聊天窗口将在当前页面内打开。
+ +