发布生产

.gitea/workflows/dev.yml

@@ -0,0 +1,79 @@
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on:
+  push:
+    branches:
+      - prod
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu64
+    steps:
+      - name: 拉取代码
+        uses: http://git.missmoc.top/mocheng/checkout@v4
+        with:
+          fetch-depth: 0
+
+#      - name: Setup Node.js
+#        uses: actions/setup-node@v3
+#        with:
+#          node-version: 16
+#          cache: 'npm'
+
+      - name: Install dependencies
+        run: |
+          npm install
+          # 安装HBuilderX命令行工具
+          npm install -g hbuilderx-cli
+
+#      - name: Build H5 project
+#        run: |
+#          # 执行HBuild项目构建
+#          npm run build
+
+      - name: Cloud package (Android)
+        run: |
+          # 使用HBuilderX CLI进行云打包
+          hbuilderx package \
+            --project . \
+            --platform android \
+            --appid ${{ secrets.HBUILDER_APPID }} \
+            --username ${{ secrets.HBUILDERX_USERNAME }} \
+            --password ${{ secrets.HBUILDERX_PASSWORD }} \
+            --output ./dist
+        env:
+          HBUILDER_CLOUD_PACKAGE: true
+
+      - name: Prepare release assets
+        run: |
+          # 重命名APK文件以便于识别版本
+          mv ./dist/*.apk ./dist/app-release-${{ github.sha }}.apk
+          # 对于iOS，根据实际打包输出调整
+          if [ -f ./dist/*.ipa ]; then
+            mv ./dist/*.ipa ./dist/app-release-${{ github.sha }}.ipa
+          fi
+
+      - name: Create Gitea Release
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/create-release@v1
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: Release ${{ github.ref_name }}
+          body: |
+            自动构建版本 ${{ github.ref_name }}
+            提交哈希: ${{ github.sha }}
+          draft: false
+          prerelease: false
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Upload Android Asset
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./dist/app-release-${{ github.sha }}.apk
+          asset_name: app-android-${{ github.ref_name }}.apk
+          asset_content_type: application/vnd.android.package-archive
+        env:
+          GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
+
+

manifest.json

@@ -1,7 +1,7 @@
 {
     "name" : "数字南川",
-    "appid" : "__UNI__3570A56",
+    "appid" : "__UNI__7AF1078",
-    "description" : "aidex敏捷开发平台",
+    "description" : "",
     "versionName" : "1.8.4",
     "versionCode" : "100",
     "transformPx" : false,
@@ -26,7 +26,9 @@
         "nvueCompiler" : "uni-app",
         "compilerVersion" : 3,
         "modules" : {
-            "Payment" : {}
+            "Payment" : {},
+            "Camera" : {},
+            "Barcode" : {}
         },
         "distribute" : {
             "android" : {
@@ -55,7 +57,9 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             "sdkConfigs" : {
                 "ad" : {},
                 "payment" : {
@@ -103,7 +107,7 @@
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "default",
+                "androidStyle" : "common",
                 "android" : {
                     "hdpi" : "E:/vueworkspace/aidex-m2m/src/assets/logo.png",
                     "xhdpi" : "E:/vueworkspace/aidex-m2m/src/assets/logo.png",

pages/sys/workbench/earlyWarning/earlyWarning.vue

@@ -40,7 +40,7 @@
           <view class="warn-info">预警位置：{{ item.deviceGroupName }}</view>
           <view class="warn-info">预警时间：{{ item.reportTime }}</view>
           <view class="warn-info">预警设备：{{ item.deviceName }}</view>
-          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap" @click.stop="goDetail(item)">
+          <view v-if="[20, 30, 31, 32].includes(item.state)" class="warn-eval-wrap">
             <view class="warn-eval-btn">去处理</view>
           </view>
         </view>
@@ -141,17 +141,17 @@
 				this.tabLoaded[idx] = true;
 				this.loading = false;
 			},
-			goDetail(item) {
-				const itemStr = encodeURIComponent(JSON.stringify(item));
-				uni.navigateTo({
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
-				});
-			},
 			goDetail2(item) {
 				const itemStr = encodeURIComponent(JSON.stringify(item));
-				uni.navigateTo({
+				if([20, 30, 31, 32].includes(item.state)){
-					url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
+					uni.navigateTo({
-				});
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr,
+					});
+				}else{
+					uni.navigateTo({
+						url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
+					});
+				}
 			},
 			goStatistics() {
 				uni.navigateTo({

pages/sys/workbench/order/orderDetail.vue

@@ -29,10 +29,17 @@
 			<view class="detail-value remark"><text>备注：</text>{{ detail.remark }}</view>
 			<view class="detail-value"><text class="detail-key">工单图片：</text></view>
 			<view class="image-list" v-if="orderImgUrls.length > 0">
-				<u-image v-for="(imgUrl, index) in orderImgUrls" :key="index" :src="imgUrl"
+				<u-image 
-					width="200rpx" height="200rpx" border-radius="10rpx"
+					v-for="(imgUrl, index) in orderImgUrls" 
+					:key="index" 
+					:src="imgUrl"
+					width="200rpx" 
+					height="200rpx" 
+					border-radius="10rpx"
 					@click="previewImage(orderImgUrls, index)"
-					style="margin-right: 20rpx; margin-bottom: 20rpx;"></u-image>
+					style="margin-right: 20rpx; margin-bottom: 20rpx;"
+					mode="aspectFill"
+				></u-image>
 			</view>
 
 		</view>
@@ -123,10 +130,14 @@
 			},
 			previewImage(urls, index) {
 				// 使用uView的图片预览组件
-				this.$u.previewImage({
+				  // 过滤掉空值
-					urls: urls.filter(url => url.trim() !== ''),
+				  const validUrls = urls.filter(url => url && url.trim() !== '')
-					current: index
+				  uni.previewImage({
-				});
+				    urls: validUrls,
+				    current: validUrls[index], // current 必须是 url，而不是索引
+				    indicator: 'number', // 显示数字指示器
+				    backgroundColor: '#000'
+				  })
 			},
 			async onConfirm(selected) {
 				let params = this.detail