Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

components/exchange/exchange.vue

@@ -7,7 +7,8 @@
 			<view class="box">
 				<view class="info" v-if="!isExchange">
 					<view :style="styles">
-						<uni-easyinput :styles="styles" v-model="code" placeholder="请输入兑换码"  :inputBorder="false" placeholderStyle="text-align: center;"></uni-easyinput>
+						<uni-easyinput :styles="styles" v-model="code" placeholder="请输入兑换码" :inputBorder="false"
+							placeholderStyle="text-align: center;"></uni-easyinput>
 					</view>
 					<view class="btn" :class="{'noValue':code==''}" @click="getExchange">
 						兑换
@@ -37,7 +38,9 @@
 </template>
 
 <script>
-	import { postJson } from "@/utils/requests.js"
+	import {
+		postJson
+	} from "@/utils/requests.js"
 	export default {
 		name: "exchange",
 		data() {
@@ -92,10 +95,10 @@
 					code: this.code
 				})
 				if (exchangeRes.code != 0) {
-					// uni.showToast({
+					uni.showToast({
-					// 	icon:"none",
+						icon: "none",
-					// 	title:exchangeRes.message
+						title: "券已使用过了"
-					// })
+					})
 					return
 				} else {
 					uni.showToast({
@@ -157,12 +160,14 @@
 					padding: 18px 0;
 					text-align: center;
 				}
+
 				.title {
 					font-size: 20px;
 					color: #1a1a1a;
 					text-align: center;
 					margin-bottom: 24px;
 				}
+
 				.time {
 					font-size: 16px;
 					color: #AAAAAA;
@@ -180,9 +185,11 @@
 				border-radius: 60px;
 				text-align: center;
 			}
+
 			.btn2 {
 				margin-top: 12px;
 			}
+
 			.noValue {
 				opacity: 0.5;
 			}
@@ -207,6 +214,7 @@
 		z-index: 1;
 		width: 54px;
 		height: 26px;
+
 		image {
 			width: 100%;
 			height: 100%;

manifest.json

@@ -6,6 +6,14 @@
     "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
+    "app-harmony" : {
+        "distribute" : {
+            "splashScreens" : {
+                "startWindowIcon" : "resource/icon.png", // 启动页图标路径
+                "startWindowBackground" : "#123456" // 启动页背景颜色
+            }
+        }
+    },
     "app-plus" : {
         "darkmode" : false,
         "usingComponents" : true,
@@ -21,6 +29,7 @@
             "subPackages" : true
         },
         "runmode" : "liberate", // 开启分包优化后，必须配置资源释放模式
+
         /* 模块配置 */
         "modules" : {
             "Camera" : {},
@@ -57,18 +66,12 @@
             "sdkConfigs" : {
                 "payment" : {
                     "weixin" : {
-                        "__platform__": [
+                        "__platform__" : [ "ios", "android" ],
-                            "ios",
-                            "android"
-                        ],
                         "appid" : "123456",
                         "UniversalLinks" : "https://hhhhh.com/apple-app-site-association/"
                     },
                     "alipay" : {
-                        "__platform__": [
+                        "__platform__" : [ "ios", "android" ]
-                            "ios",
-                            "android"
-                        ]
                     }
                 }
             }

pages.json

@@ -287,6 +287,14 @@
 						"navigationBarTitleText": "从夯倒拉排名",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "certificate/graduate",
+					"style" : 
+					{
+						"navigationBarTitleText" : "证书",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},

pages/balance/index.vue

@@ -211,7 +211,7 @@ onLoad(async () => {
 })
 
 onShow(() => {
-	// #ifdef APP-PLUS
+	// #ifdef APP-PLUS&&!APP-HARMONY
 	util.setAndroidSystemBarColor('#F0F3F8')
 	setTimeout(() => {
 		plus.navigator.setStatusBarStyle("light");

pages/index/index.nvue

@@ -285,6 +285,11 @@ const otherList = [{
 	name: "购物",
 	path: "/pages/shopping/index"
 },
+{
+	icon: "/static/image/other/certificate/certificate.png",
+	name: "证书",
+	path: "/pages/other/certificate/graduate"
+},
 ]
 
 const data = reactive({

pages/other/card/card.vue

@@ -4,6 +4,10 @@
 		<ZdyNavbar @right-click="edit" isRightButton rightButtonText="编辑" :title="data.navbar.title"
 			:bgColor="data.navbar.bgColor" :isBack="true" />
 
+		<view style="display: flex;align-items: center;background: #fff;border-radius: 10px;margin: 10px;padding: 2px 5px;">
+			<image src="/static/image/other/notice.png" style="width: 16px;height: 16px;margin-right: 10rpx;"></image>
+			此功能不具备真实性，仅供娱乐
+		</view>
 		<image :src="data.code" mode="widthFix" style="width: 100vw;" @click="previewImage"></image>
 		<view class="button-container">
 			<button class="btn-save-image" @click="saveImage">保存图片</button>

pages/other/qf-image/qf-image.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<qf-image-cropper :src="data.src" :width="196" :height="230" :radius="0" @crop="handleCrop"
+		<qf-image-cropper :src="data.src" :width="data.width" :height="data.height" :radius="0" @crop="handleCrop"
 			:reverseRotatable="true"></qf-image-cropper>
 	</view>
 </template>
@@ -25,14 +25,26 @@
 		proxy
 	} = getCurrentInstance();
 	const data = reactive({
-		src: ""
+		src: "",
+		width:196,
+		height:230,
+		isCard:true
 	})
 	onLoad((option) => {
 		console.log(option)
 		data.src = option.src
+		if(option.width){
+			data.width=option.width*2
+			data.isCard=false
+		}
+		if(option.height){
+			data.height=option.height*2
+			data.isCard=false
+		}
 	})
 
 	function handleCrop(e) {
+		if(data.isCard){
 			uni.showLoading({
 				title:"抠图中"
 			})
@@ -54,13 +66,19 @@
 			}).catch(err => {
 				uni.hideLoading()
 			})
-		// uni.saveFile({
+		}else{
-		// 	tempFilePath: e.tempFilePath,
+			uni.saveFile({
-		// 	success: function(res) {
+				tempFilePath: e.tempFilePath,
-		// 		console.log(res)
+				success: function(res) {
-		// 		// res.avatar = res.savedFilePath
+					console.log(res)
-		// 	}
+					uni.$emit("editFormPhoto", decodeURI(res.savedFilePath))
-		// });
+					uni.navigateBack()
+					// res.avatar = res.savedFilePath
+				}
+			});
+		}
+		
+
 	}
 	/**
 	 * 将本地图片路径通过 Canvas 转换为 File 对象

utils/requests.js

@@ -222,13 +222,13 @@ const request = (method = 'GET', serverUrl, domainUrl, params, dataType = "json"
 								res: res
 							}
 						})
-					}
-
-					uni.hideLoading();
 						uni.showToast({
 							icon: 'none',
 							title: res.data.message
 						})
+					}
+
+					uni.hideLoading();
 					return reject(res);
 				}