Browse Source

个人中心和详情页

ck@123911.net 3 tháng trước cách đây
mục cha
commit
88786822bf
3 tập tin đã thay đổi với 230 bổ sung227 xóa
  1. 212 212
      manifest.json
  2. 4 5
      pages/index/articleDetail.vue
  3. 14 10
      pages/my/my.vue

+ 212 - 212
manifest.json

@@ -1,213 +1,213 @@
 {
-	"name": "遇见玛特",
-	"appid": "__UNI__A59181F",
-	"description": "",
-	"versionName": "3.0.0",
-	"versionCode": 300,
-	"transformPx": false,
-	/* 5+App特有相关 hfhz-mrro-iqmv-igdl storygarden2024@outlook.com*/
-	"app-plus": {
-		"compatible": {
-			"ignoreVersion": true
-		},
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": false,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		"safearea": {
-			"background": "#00000000",
-			"bottom": {
-				"offset": "none"
-			}
-		},
-		/* 模块配置 */
-		"modules": {
-			"Push": {},
-			"Geolocation": {},
-			"Camera": {},
-			"Record": {},
-			"Payment": {},
-			"Share": {},
-			"VideoPlayer": {}
-		},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				],
-				"permissionPhoneState": {
-					"request": "none",
-					"prompt": "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
-				},
-				"permissionExternalStorage": {
-					"request": "none",
-					"prompt": "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
-				},
-				"abiFilters": ["armeabi-v7a", "arm64-v8a"],
-				"minSdkVersion": 21,
-				"targetSdkVersion": 31,
-				"enableOAID": false
-			},
-			/* ios打包配置 */
-			"ios": {
-				"UIBackgroundModes": "",
-				"dSYMs": false,
-				"idfa": false
-			},
-			/* SDK配置 */
-			"sdkConfigs": {
-				"ad": {},
-				"payment": {
-					"weixin": {
-						"__platform__": ["android"],
-						"appid": "wxc2e41e751946f425",
-						"UniversalLinks": ""
-					}
-				},
-				"speech": {},
-				"oauth": {},
-				"push": {
-					"unipush": {
-						"version": "2",
-						"offline": true,
-						"mi": {},
-						"oppo": {},
-						"vivo": {},
-						"honor": {}
-					}
-				},
-				"geolocation": {
-					"system": {
-						"__platform__": ["android"]
-					}
-				},
-				"share": {
-					"weixin": {
-						"appid": "wxc2e41e751946f425",
-						"UniversalLinks": ""
-					}
-				}
-			},
-			"splashscreen": {
-				"androidStyle": "default",
-				"useOriginalMsgbox": true,
-				"iosStyle": "common",
-				"ios": {},
-				"android": {
-					"xxhdpi": "static/image/xiong-bg.png",
-					"xhdpi": "static/image/xiong-bg.png",
-					"hdpi": "static/image/xiong-bg.png"
-				}
-			},
-			"icons": {
-				"android": {
-					"hdpi": "unpackage/res/icons/72x72.png",
-					"xhdpi": "unpackage/res/icons/96x96.png",
-					"xxhdpi": "unpackage/res/icons/144x144.png",
-					"xxxhdpi": "unpackage/res/icons/192x192.png"
-				},
-				"ios": {
-					"appstore": "unpackage/res/icons/1024x1024.png",
-					"ipad": {
-						"app": "unpackage/res/icons/76x76.png",
-						"app@2x": "unpackage/res/icons/152x152.png",
-						"notification": "unpackage/res/icons/20x20.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"proapp@2x": "unpackage/res/icons/167x167.png",
-						"settings": "unpackage/res/icons/29x29.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"spotlight": "unpackage/res/icons/40x40.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png"
-					},
-					"iphone": {
-						"app@2x": "unpackage/res/icons/120x120.png",
-						"app@3x": "unpackage/res/icons/180x180.png",
-						"notification@2x": "unpackage/res/icons/40x40.png",
-						"notification@3x": "unpackage/res/icons/60x60.png",
-						"settings@2x": "unpackage/res/icons/58x58.png",
-						"settings@3x": "unpackage/res/icons/87x87.png",
-						"spotlight@2x": "unpackage/res/icons/80x80.png",
-						"spotlight@3x": "unpackage/res/icons/120x120.png"
-					}
-				}
-			}
-		}
-	},
-	"networkTimeout": {
-		"request": 6000
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"channel_list": [{
-			"id": "wandoujia",
-			"name": "豌豆荚"
-		},
-		{
-			"id": "market",
-			"name": "市场部"
-		},
-		{
-			"id": "honor",
-			"name": "荣耀"
-		}
-	],
-	"vueVersion": "2",
-	"h5": {
-		"router": {
-			"base": "./",
-			"mode": "hash"
-		},
-		"template": "h5.template.html",
-		"optimization": {
-			"treeShaking": {
-				"enable": true
-			}
-		},
-		"unipush": {
-			"enable": true
-		}
-	},
-	"fallbackLocale": "zh-Hans"
-}
+    "name" : "萌创星球",
+    "appid" : "__UNI__00BD11F",
+    "description" : "",
+    "versionName" : "3.0.0",
+    "versionCode" : 300,
+    "transformPx" : false,
+    /* 5+App特有相关 hfhz-mrro-iqmv-igdl storygarden2024@outlook.com*/
+    "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "safearea" : {
+            "background" : "#00000000",
+            "bottom" : {
+                "offset" : "none"
+            }
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Camera" : {},
+            "Record" : {},
+            "Payment" : {},
+            "Share" : {},
+            "VideoPlayer" : {},
+            "Geolocation" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用,需要获取设备识别码(部分手机提示为获取手机号码)使用权限,请允许。"
+                },
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息,需要获取读写手机存储(系统提示为访问设备上的照片、媒体内容和文件)权限,请允许。"
+                },
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "minSdkVersion" : 21,
+                "targetSdkVersion" : 31,
+                "enableOAID" : false
+            },
+            /* ios打包配置 */
+            "ios" : {
+                "UIBackgroundModes" : "",
+                "dSYMs" : false,
+                "idfa" : false
+            },
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {},
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wxc2e41e751946f425",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "speech" : {},
+                "oauth" : {},
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+                        "mi" : {},
+                        "oppo" : {},
+                        "vivo" : {},
+                        "honor" : {}
+                    }
+                },
+                "geolocation" : {
+                    "system" : {
+                        "__platform__" : [ "android" ]
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxc2e41e751946f425",
+                        "UniversalLinks" : ""
+                    }
+                }
+            },
+            "splashscreen" : {
+                "androidStyle" : "default",
+                "useOriginalMsgbox" : true,
+                "iosStyle" : "common",
+                "ios" : {},
+                "android" : {
+                    "xxhdpi" : "static/image/xiong-bg.png",
+                    "xhdpi" : "static/image/xiong-bg.png",
+                    "hdpi" : "static/image/xiong-bg.png"
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
+        }
+    },
+    "networkTimeout" : {
+        "request" : 6000
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "channel_list" : [
+        {
+            "id" : "wandoujia",
+            "name" : "豌豆荚"
+        },
+        {
+            "id" : "market",
+            "name" : "市场部"
+        },
+        {
+            "id" : "honor",
+            "name" : "荣耀"
+        }
+    ],
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        },
+        "template" : "h5.template.html",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "unipush" : {
+            "enable" : true
+        }
+    },
+    "fallbackLocale" : "zh-Hans"
+}

+ 4 - 5
pages/index/articleDetail.vue

@@ -170,14 +170,14 @@
 
 				myInfo: {
 					user_id: 1, // 用户id
-					user_name: "cc", // 用户名
-					user_avatar: "https://img0.baidu.com/it/u=2836960144,3650263035&fm=253&fmt=auto&app=138&f=JPEG?w=474&h=474", // 用户头像地址
+					user_name: "", // 用户名
+					user_avatar: "", // 用户头像地址
 				},
 				// 文章作者信息(提示: 一般来自localstorage, 如果是实时获取的话, 那么获取到数据后再v-if显示评论组件)
 				userInfo: {
 					user_id: 2, // 用户id
-					user_name: "ikun", // 用户名
-					user_avatar: "https://pic1.zhimg.com/80/v2-a79071a705f55c5d88f6c74e6111fe84_720w.webp", // 用户头像地址
+					user_name: "", // 用户名
+					user_avatar: "", // 用户头像地址
 				},
 				deleteMode: "all", //删除模式
 				// 评论总数
@@ -214,7 +214,6 @@
 			previewOpen(imgs1, index) {
 				this.imgs = imgs1.split("|");
 				setTimeout(() => this.$refs.previewImage.open(index), 0)
-				// 传入当前选中的图片地址或序号
 				return; //如需测试和uni原生预览差别可注释这两行
 			},
 			loadData() {

+ 14 - 10
pages/my/my.vue

@@ -80,12 +80,17 @@
 							<image v-if="activeTab === 0" class="icon"
 								:src="item.images || item.img_url || item.url || '../../static/logo.png'"
 								mode="aspectFit" />
+							<image v-if="activeTab === 1 && item.status == 9" class="icon"
+								:src="item.result_images || '../../static/logo.png'" mode="aspectFit" />
 
 							<!-- 当activeTab为1时显示队列状态 -->
 							<view v-else class="queue-status">
 								<!-- 排队中 -->
 								<view v-if="item.status === 1" class="status-text">
 									排队中({{item.queue_position}}/{{item.all_position}})</view>
+								<!-- 排队中 -->
+								<view v-if="item.status === 3 || item.status === 4" class="status-text">
+									生成失败</view>
 								<!-- 制作中 -->
 								<view v-else-if="item.status < 9" class="status-text">制作中</view>
 								<!-- 创作完成 -->
@@ -412,19 +417,18 @@
 				});
 			},
 			goWork(item) {
-				uni.$emit('check_login', () => {
-					if (this.activeTab == 0) {
+				uni.$emit('check_login', () => {})
+				if (this.activeTab == 0) {
+					uni.navigateTo({
+						url: '/pages/index/workDetail?id=' + item.id
+					})
+				} else {
+					if (item.status >= 9) {
 						uni.navigateTo({
-							url: '/pages/index/workDetail?id=' + item.id
+							url: '/pages/makedetail/makeDetail?id=' + item.id
 						})
-					} else {
-						if (item.status >= 9) {
-							uni.navigateTo({
-								url: '/pages/makedetail/makeDetail?id=' + item.id
-							})
-						}
 					}
-				})
+				}
 			},
 			navigateToSettings() {
 				uni.$emit('check_login', () => {