From 1e16e86d1e790234bdd6013bc3b50335ea99b0f3 Mon Sep 17 00:00:00 2001
From: han <151435705@qq.com>
Date: Tue, 17 Dec 2024 15:08:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPageA/shop/shopList/shopList.vue           |  2 +-
 subPageC/bookHomestay/bookHomestay.vue        | 15 +++++++-------
 subPageC/bookShop/bookShop.vue                |  5 ++---
 subPageC/orderHomestay/orderDetail.vue        |  1 -
 subPageC/orderHomestay/orderList.vue          |  1 -
 subPageC/orderShop/orderDetail.vue            |  7 +++----
 subPageC/orderShop/orderList.vue              | 11 +++++-----
 subPageC/translate/index.vue                  | 20 +++++++++----------
 .../uni-easyinput/uni-easyinput.vue           |  2 +-
 .../components/sy-audio/sy-audio.json         |  4 ++--
 .../components/xi-waterfall/xi-waterfall.json |  4 ++--
 .../subPageA/shop/shopList/shopList.wxss      |  2 +-
 .../dev/mp-weixin/subPageC/translate/index.js |  2 +-
 .../mp-weixin/subPageC/translate/index.wxml   |  2 +-
 .../mp-weixin/subPageC/translate/index.wxss   |  8 +++++++-
 .../uni-easyinput/uni-easyinput.wxss          |  2 +-
 16 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/subPageA/shop/shopList/shopList.vue b/subPageA/shop/shopList/shopList.vue
index e7782d6..f92dbef 100644
--- a/subPageA/shop/shopList/shopList.vue
+++ b/subPageA/shop/shopList/shopList.vue
@@ -120,7 +120,7 @@
 
 <style lang="scss">
 	.v-shop-list {
-		padding: 0 24rpx;
+		padding: 24rpx;
 		flex-wrap: wrap;
 		margin-left: -24rpx;
 
diff --git a/subPageC/bookHomestay/bookHomestay.vue b/subPageC/bookHomestay/bookHomestay.vue
index 2c5452e..614384b 100644
--- a/subPageC/bookHomestay/bookHomestay.vue
+++ b/subPageC/bookHomestay/bookHomestay.vue
@@ -180,7 +180,7 @@
 					this.$Request.post(this.$config.createHotelOrder, data, 'json', null, false, true).then((
 						res) => {
 						if (res.code == 0) {
-							this.orderPay = res.data							
+							this.orderPay = res.data
 							this.payOrder()
 						} else if (res.code == 600) {
 							uni.showToast({
@@ -213,7 +213,7 @@
 					uni.showToast({
 						title: '支付成功',
 						icon: 'none'
-					});					
+					});
 					setTimeout(() => {
 						uni.redirectTo({
 							url: "/subPageC/orderHomestay/orderList"
@@ -234,7 +234,7 @@
 				}
 				//uni.showToast({title: data.detail.errMsg,icon:'none'});
 			},
-			
+
 			closePay() {
 				let that = this
 				uni.showModal({
@@ -243,23 +243,22 @@
 					cancelText: '再想想',
 					showCancel: true,
 					success: function(res) {
-						if (res.confirm) {							
+						if (res.confirm) {
+              that.isPayPopup = false
 							setTimeout(() => {
 								uni.redirectTo({
 									url: "/subPageC/orderHomestay/orderList"
 								});
-								that.isPayPopup = false
 							}, 500)
 						} else if (res.cancel) {
 							console.log('用户点击取消');
-							that.isPayPopup = false
 						}
 					}
 				})
-			}			
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/subPageC/bookShop/bookShop.vue b/subPageC/bookShop/bookShop.vue
index 52194ba..a7c6d9f 100644
--- a/subPageC/bookShop/bookShop.vue
+++ b/subPageC/bookShop/bookShop.vue
@@ -204,15 +204,14 @@
 					showCancel: true,
 					success: function(res) {
 						if (res.confirm) {
+              that.isPayPopup = false
 							setTimeout(() => {
 								uni.redirectTo({
 									url: "/subPageC/orderShop/orderList"
 								});
-								that.isPayPopup = false
 							}, 500)
 						} else if (res.cancel) {
 							console.log('用户点击取消');
-							that.isPayPopup = false
 						}
 					}
 				})
@@ -262,4 +261,4 @@
 		font-weight: bold;
 		margin-bottom: 10rpx;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/subPageC/orderHomestay/orderDetail.vue b/subPageC/orderHomestay/orderDetail.vue
index 2f264dd..f91be7d 100644
--- a/subPageC/orderHomestay/orderDetail.vue
+++ b/subPageC/orderHomestay/orderDetail.vue
@@ -352,7 +352,6 @@
 							that.isPayPopup = false
 						} else if (res.cancel) {
 							console.log('用户点击取消');
-							this.isPayPopup=false
 						}
 					}
 				})
diff --git a/subPageC/orderHomestay/orderList.vue b/subPageC/orderHomestay/orderList.vue
index 55a66be..ab8a232 100644
--- a/subPageC/orderHomestay/orderList.vue
+++ b/subPageC/orderHomestay/orderList.vue
@@ -205,7 +205,6 @@
 							that.isPayPopup = false
 						} else if (res.cancel) {
 							console.log('用户点击取消');
-							this.isPayPopup = false
 						}
 					}
 				})
diff --git a/subPageC/orderShop/orderDetail.vue b/subPageC/orderShop/orderDetail.vue
index 6e87855..8d42462 100644
--- a/subPageC/orderShop/orderDetail.vue
+++ b/subPageC/orderShop/orderDetail.vue
@@ -24,7 +24,7 @@
 				<view class="col-12">
 					<view class="cancel-btn" @click="cacelOrder">取消订单</view>
 				</view>
-			</view>			
+			</view>
 			<!-- <view v-if="homestayOrderData.orderStatus != '0' && homestayOrderData.orderStatus !='1'">
         <view class="pay-btn">再次预订</view>
       </view> -->
@@ -347,7 +347,6 @@
 							that.isPayPopup = false
 						} else if (res.cancel) {
 							console.log('用户点击取消');
-							this.isPayPopup = false
 						}
 					}
 				})
@@ -652,7 +651,7 @@
 					font-size: 24rpx;
 					color: #808080;
 				}
-				
+
 				.num-price {
 					margin-top: 8rpx;
 					font-size: 24rpx;
@@ -754,4 +753,4 @@
 			font-weight: bold;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/subPageC/orderShop/orderList.vue b/subPageC/orderShop/orderList.vue
index 84dea02..925b0a8 100644
--- a/subPageC/orderShop/orderList.vue
+++ b/subPageC/orderShop/orderList.vue
@@ -8,9 +8,9 @@
           <view class="item_image">
             <image class="img" :src="item.picUrls" mode="widthFix"></image>
           </view>
-          <view class="item_content col">          
+          <view class="item_content col">
             <view class="content-date">{{item.goodsName}}¥{{item.goodsPrice}}
-              *          
+              *
               {{item.goodsNum}}
             </view>
             <view class="content-price">总价：¥{{item.orderAmount}}</view>
@@ -18,10 +18,10 @@
         </view>
         <view class="item_content">
           <view class="content-bottom">
-            <view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view>         
+            <view class="btn" v-if="item.orderStatus=='0'" @click="payOrder(item)">去支付</view>
             <view class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view>
           </view>
-        </view>       
+        </view>
         <view class="tip-state m-t-12" v-if="item.orderStatus=='1'">等待商家接单中，请及时关注订单状态</view>
         <view class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view>
       </view>
@@ -179,7 +179,6 @@ export default {
             that.isPayPopup = false
           } else if (res.cancel) {
             console.log('用户点击取消');
-            this.isPayPopup=false
           }
         }
       })
@@ -224,7 +223,7 @@ export default {
 
     .item_title {
       margin-top: -5rpx;
-      margin-bottom: 10rpx;     
+      margin-bottom: 10rpx;
       font-size: 32rpx;
       color: #1B1B1B;
       font-weight: bold;
diff --git a/subPageC/translate/index.vue b/subPageC/translate/index.vue
index 33006b8..f041930 100644
--- a/subPageC/translate/index.vue
+++ b/subPageC/translate/index.vue
@@ -28,8 +28,7 @@
 			</view>	
 					
 			<view class="result">
-				<uni-easyinput class="translate" :inputBorder="false" placeholderStyle="fontSize:16px" type="textarea"
-					v-model="resultText" :autoHeight="true" v-if="resultText"></uni-easyinput>						
+				<zero-markdown-view :markdown="resultText"></zero-markdown-view>							
 			</view>
 		</view>
 
@@ -188,8 +187,7 @@
 									title: '识别成功',
 									icon: 'success',
 									duration: 1000
-								})
-								console.log('识别成功恩子', res.data)
+								})								
 								if (data.data !== null) {
 									data.data.forEach((item) => {
 										this.ActiveText = this.ActiveText + item.words +
@@ -249,14 +247,13 @@
 						}
 					}
 					this.$Request.get(this.$config.getTtranslate, queryParams, "", "", false, true)
-						.then(res => {
-							console.log('this.ActiveText',this.ActiveText)
+						.then(res => {						
 							if (res.data !== null) {
-								this.resultText = res.data
-								console.log('this.resultText',this.resultText)
+								this.resultText = res.data.replaceAll('\n', '</br>');								
 							} else {
-								this.resultText = this.ActiveText
+								this.resultText = this.ActiveText.replaceAll('\n', '</br>');
 							}
+							console.log(this.resultText)
 						})
 				}
 			},
@@ -357,12 +354,13 @@
 		}
 
 		.result {
-			border-top: 1rpx solid #f0f0f0;
-			padding: 24rpx;
+			border-top: 1rpx solid #f0f0f0;			
 			color: #0983ff;
 			font-weight: bold;
 			max-height: 40vh;
 			overflow-y: auto;
+			.zero-markdown-view{font-size: 32rpx; color: #0983ff;}
+			rich-text{font-size: 32rpx!important;}
 		}
 
 		.btn {
diff --git a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
index d41411b..4dae71e 100644
--- a/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
+++ b/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
@@ -581,7 +581,7 @@
 
 	.uni-easyinput__placeholder-class {
 		color: #999;
-		font-size: 12px;
+		font-size: 14px;
 		// font-weight: 200;
 	}
 
diff --git a/unpackage/dist/dev/mp-weixin/subPageA/components/sy-audio/sy-audio.json b/unpackage/dist/dev/mp-weixin/subPageA/components/sy-audio/sy-audio.json
index e8cfaaf..4575d1b 100644
--- a/unpackage/dist/dev/mp-weixin/subPageA/components/sy-audio/sy-audio.json
+++ b/unpackage/dist/dev/mp-weixin/subPageA/components/sy-audio/sy-audio.json
@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/subPageA/components/xi-waterfall/xi-waterfall.json b/unpackage/dist/dev/mp-weixin/subPageA/components/xi-waterfall/xi-waterfall.json
index e8cfaaf..4575d1b 100644
--- a/unpackage/dist/dev/mp-weixin/subPageA/components/xi-waterfall/xi-waterfall.json
+++ b/unpackage/dist/dev/mp-weixin/subPageA/components/xi-waterfall/xi-waterfall.json
@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/subPageA/shop/shopList/shopList.wxss b/unpackage/dist/dev/mp-weixin/subPageA/shop/shopList/shopList.wxss
index 084fe1b..64c01a4 100644
--- a/unpackage/dist/dev/mp-weixin/subPageA/shop/shopList/shopList.wxss
+++ b/unpackage/dist/dev/mp-weixin/subPageA/shop/shopList/shopList.wxss
@@ -25,7 +25,7 @@
 /* 透明度 */
 /* 文章场景相关 */
 .v-shop-list {
-  padding: 0 24rpx;
+  padding: 24rpx;
   flex-wrap: wrap;
   margin-left: -24rpx;
 }
diff --git a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.js b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.js
index 011d1bb..61199e2 100644
--- a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.js
+++ b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.js
@@ -1,2 +1,2 @@
-require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["subPageC/translate/index"],{1137:function(e,t,n){"use strict";(function(e,t){var o=n(4);n(26);o(n(25));var i=o(n(1138));e.__webpack_require_UNI_MP_PLUGIN__=n,t(i.default)}).call(this,n(1)["default"],n(2)["createPage"])},1138:function(e,t,n){"use strict";n.r(t);var o=n(1139),i=n(1141);for(var a in i)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(a);n(1143);var u,r=n(231),l=Object(r["default"])(i["default"],o["render"],o["staticRenderFns"],!1,null,null,null,!1,o["components"],u);l.options.__file="subPageC/translate/index.vue",t["default"]=l.exports},1139:function(e,t,n){"use strict";n.r(t);var o=n(1140);n.d(t,"render",(function(){return o["render"]})),n.d(t,"staticRenderFns",(function(){return o["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return o["recyclableRender"]})),n.d(t,"components",(function(){return o["components"]}))},1140:function(e,t,n){"use strict";var o;n.r(t),n.d(t,"render",(function(){return i})),n.d(t,"staticRenderFns",(function(){return u})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return o}));try{o={uniEasyinput:function(){return n.e("uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(n.bind(null,1375))},uPicker:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(n.bind(null,1589))}}}catch(r){if(-1===r.message.indexOf("Cannot find module")||-1===r.message.indexOf(".vue"))throw r;console.error(r.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var i=function(){var e=this,t=e.$createElement;e._self._c;e._isMounted||(e.e0=function(t){e.fromShow=!0},e.e1=function(t){e.exchange=!e.exchange},e.e2=function(t){e.toShow=!0},e.e3=function(t){e.fromShow=!1},e.e4=function(t){e.fromShow=!1},e.e5=function(t){e.toShow=!1},e.e6=function(t){e.toShow=!1})},a=!1,u=[];i._withStripped=!0},1141:function(e,t,n){"use strict";n.r(t);var o=n(1142),i=n.n(o);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);t["default"]=i.a},1142:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(function(){return resolve(n(1589))}.bind(null,n)).catch(n.oe)},i=function(){n.e("subPageC/components/zero-markdown-view/components/zero-markdown-view/zero-markdown-view").then(function(){return resolve(n(1548))}.bind(null,n)).catch(n.oe)},a={components:{UPicker:o,ZeroMarkdownView:i},data:function(){return{rootPath:this.$config.ROOTPATH,imageSrc:"",imageTitle:"",search_result:[],ActiveText:"",resultText:"",exchange:!1,fromShow:!1,toShow:!1,ActiveFrom:{id:0,value:"auto",label:"自动识别"},fromRange:[[{id:0,value:"auto",label:"自动识别"},{id:1,value:"zh",label:"中文"},{id:2,value:"en",label:"英语"},{id:3,value:"jp",label:"日语"},{id:4,value:"kor",label:"韩语"},{id:5,value:"fra",label:"法语"},{id:6,value:"spa",label:"西班牙语"},{id:7,value:"ara",label:"阿拉伯语"},{id:8,value:"de",label:"德语"}]],ActiveTo:{id:1,value:"zh",label:"中文"},toRange:[[{id:1,value:"zh",label:"中文"},{id:2,value:"en",label:"英语"},{id:3,value:"jp",label:"日语"},{id:4,value:"kor",label:"韩语"},{id:5,value:"fra",label:"法语"},{id:6,value:"spa",label:"西班牙语"},{id:7,value:"ara",label:"阿拉伯语"},{id:8,value:"de",label:"德语"}]]}},onLoad:function(){},methods:{chooseImage:function(){var t=this,n=this;this.ActiveText="",this.resultText="",e.chooseMedia({count:1,sizeType:["compressed"],mediaType:["image"],sourceType:["camera","album"],success:function(o){n.imageSrc=o.tempFiles[0].tempFilePath,e.showLoading({title:"识别中..."}),t.task=e.uploadFile({url:t.rootPath+"/app-api/wechatshop/toolIdentify/identifyText",filePath:n.imageSrc,name:"file",formData:{file:n.imageSrc},success:function(o){var i=JSON.parse(o.data);e.showToast({title:"识别成功",icon:"success",duration:1e3}),console.log("识别成功恩子",o.data),null!==i.data?i.data.forEach((function(e){t.ActiveText=t.ActiveText+e.words+"\n"})):t.ActiveText="",n.gotoTranslate()},fail:function(t){e.showModal({content:t.errMsg,showCancel:!1})},complete:function(n){e.hideLoading(),t.task=null}})},fail:function(e){console.log("chooseImage fail",e)}})},changeFrom:function(e){this.fromShow=!1,this.ActiveFrom=e.value[0],this.gotoTranslate()},changeTo:function(e){this.toShow=!1,this.ActiveTo=e.value[0],this.gotoTranslate()},gotoTranslate:function(){var e,t=this;this.ActiveFrom.value==this.ActiveTo.value?this.resultText=this.ActiveText:(e=this.exchange?{query:this.ActiveText,from:this.ActiveTo.value,to:this.ActiveFrom.value}:{query:this.ActiveText,from:this.ActiveFrom.value,to:this.ActiveTo.value},this.$Request.get(this.$config.getTtranslate,e,"","",!1,!0).then((function(e){console.log("this.ActiveText",t.ActiveText),null!==e.data?(t.resultText=e.data,console.log("this.resultText",t.resultText)):t.resultText=t.ActiveText})))}}};t.default=a}).call(this,n(2)["default"])},1143:function(e,t,n){"use strict";n.r(t);var o=n(1144),i=n.n(o);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);t["default"]=i.a},1144:function(e,t,n){}},[[1137,"common/runtime","common/vendor"]]]);
+require('../common/vendor.js');(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["subPageC/translate/index"],{1137:function(e,t,n){"use strict";(function(e,t){var o=n(4);n(26);o(n(25));var i=o(n(1138));e.__webpack_require_UNI_MP_PLUGIN__=n,t(i.default)}).call(this,n(1)["default"],n(2)["createPage"])},1138:function(e,t,n){"use strict";n.r(t);var o=n(1139),i=n(1141);for(var a in i)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(a);n(1143);var r,u=n(231),l=Object(u["default"])(i["default"],o["render"],o["staticRenderFns"],!1,null,null,null,!1,o["components"],r);l.options.__file="subPageC/translate/index.vue",t["default"]=l.exports},1139:function(e,t,n){"use strict";n.r(t);var o=n(1140);n.d(t,"render",(function(){return o["render"]})),n.d(t,"staticRenderFns",(function(){return o["staticRenderFns"]})),n.d(t,"recyclableRender",(function(){return o["recyclableRender"]})),n.d(t,"components",(function(){return o["components"]}))},1140:function(e,t,n){"use strict";var o;n.r(t),n.d(t,"render",(function(){return i})),n.d(t,"staticRenderFns",(function(){return r})),n.d(t,"recyclableRender",(function(){return a})),n.d(t,"components",(function(){return o}));try{o={uniEasyinput:function(){return n.e("uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(n.bind(null,1375))},uPicker:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(n.bind(null,1589))}}}catch(u){if(-1===u.message.indexOf("Cannot find module")||-1===u.message.indexOf(".vue"))throw u;console.error(u.message),console.error("1. 排查组件名称拼写是否正确"),console.error("2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"),console.error("3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件")}var i=function(){var e=this,t=e.$createElement;e._self._c;e._isMounted||(e.e0=function(t){e.fromShow=!0},e.e1=function(t){e.exchange=!e.exchange},e.e2=function(t){e.toShow=!0},e.e3=function(t){e.fromShow=!1},e.e4=function(t){e.fromShow=!1},e.e5=function(t){e.toShow=!1},e.e6=function(t){e.toShow=!1})},a=!1,r=[];i._withStripped=!0},1141:function(e,t,n){"use strict";n.r(t);var o=n(1142),i=n.n(o);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);t["default"]=i.a},1142:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var o=function(){Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(function(){return resolve(n(1589))}.bind(null,n)).catch(n.oe)},i=function(){n.e("subPageC/components/zero-markdown-view/components/zero-markdown-view/zero-markdown-view").then(function(){return resolve(n(1548))}.bind(null,n)).catch(n.oe)},a={components:{UPicker:o,ZeroMarkdownView:i},data:function(){return{rootPath:this.$config.ROOTPATH,imageSrc:"",imageTitle:"",search_result:[],ActiveText:"",resultText:"",exchange:!1,fromShow:!1,toShow:!1,ActiveFrom:{id:0,value:"auto",label:"自动识别"},fromRange:[[{id:0,value:"auto",label:"自动识别"},{id:1,value:"zh",label:"中文"},{id:2,value:"en",label:"英语"},{id:3,value:"jp",label:"日语"},{id:4,value:"kor",label:"韩语"},{id:5,value:"fra",label:"法语"},{id:6,value:"spa",label:"西班牙语"},{id:7,value:"ara",label:"阿拉伯语"},{id:8,value:"de",label:"德语"}]],ActiveTo:{id:1,value:"zh",label:"中文"},toRange:[[{id:1,value:"zh",label:"中文"},{id:2,value:"en",label:"英语"},{id:3,value:"jp",label:"日语"},{id:4,value:"kor",label:"韩语"},{id:5,value:"fra",label:"法语"},{id:6,value:"spa",label:"西班牙语"},{id:7,value:"ara",label:"阿拉伯语"},{id:8,value:"de",label:"德语"}]]}},onLoad:function(){},methods:{chooseImage:function(){var t=this,n=this;this.ActiveText="",this.resultText="",e.chooseMedia({count:1,sizeType:["compressed"],mediaType:["image"],sourceType:["camera","album"],success:function(o){n.imageSrc=o.tempFiles[0].tempFilePath,e.showLoading({title:"识别中..."}),t.task=e.uploadFile({url:t.rootPath+"/app-api/wechatshop/toolIdentify/identifyText",filePath:n.imageSrc,name:"file",formData:{file:n.imageSrc},success:function(o){var i=JSON.parse(o.data);e.showToast({title:"识别成功",icon:"success",duration:1e3}),null!==i.data?i.data.forEach((function(e){t.ActiveText=t.ActiveText+e.words+"\n"})):t.ActiveText="",n.gotoTranslate()},fail:function(t){e.showModal({content:t.errMsg,showCancel:!1})},complete:function(n){e.hideLoading(),t.task=null}})},fail:function(e){console.log("chooseImage fail",e)}})},changeFrom:function(e){this.fromShow=!1,this.ActiveFrom=e.value[0],this.gotoTranslate()},changeTo:function(e){this.toShow=!1,this.ActiveTo=e.value[0],this.gotoTranslate()},gotoTranslate:function(){var e,t=this;this.ActiveFrom.value==this.ActiveTo.value?this.resultText=this.ActiveText:(e=this.exchange?{query:this.ActiveText,from:this.ActiveTo.value,to:this.ActiveFrom.value}:{query:this.ActiveText,from:this.ActiveFrom.value,to:this.ActiveTo.value},this.$Request.get(this.$config.getTtranslate,e,"","",!1,!0).then((function(e){null!==e.data?t.resultText=e.data.replaceAll("\n","</br>"):t.resultText=t.ActiveText.replaceAll("\n","</br>"),console.log(t.resultText)})))}}};t.default=a}).call(this,n(2)["default"])},1143:function(e,t,n){"use strict";n.r(t);var o=n(1144),i=n.n(o);for(var a in o)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return o[e]}))}(a);t["default"]=i.a},1144:function(e,t,n){}},[[1137,"common/runtime","common/vendor"]]]);
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/subPageC/translate/index.js.map
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxml b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxml
index 15fff12..7207611 100644
--- a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxml
@@ -1 +1 @@
-<view class="v-pages-translate"><view class="v-translate-bg"></view><view class="v-translate-card container-fluid v-translate-box"><view class="row select flex-align-center"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['col','row','select-item','flex-align-center','left',exchange?'right-to-left':'left-to-right']}}" bindtap="__e"><text class="col">{{ActiveFrom.label}}</text><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate-down.png"></image></view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="exchange" bindtap="__e"><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate.png"></image></view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="{{['col','row','select-item','flex-align-center','right',exchange?'left-to-right':'right-to-left']}}" bindtap="__e"><text class="col">{{ActiveTo.label}}</text><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate-down.png"></image></view></view><view class="p-l-24 p-r-24"><uni-easyinput class="translate" vue-id="5c0c0102-1" inputBorder="{{false}}" placeholderStyle="fontSize:16px" type="textarea" placeholder="请输入翻译内容" value="{{ActiveText}}" data-event-opts="{{[['^confirm',[['gotoTranslate']]],['^input',[['__set_model',['','ActiveText','$event',[]]]]]]}}" bind:confirm="__e" bind:input="__e" bind:__l="__l"></uni-easyinput></view><view class="result"><block wx:if="{{resultText}}"><uni-easyinput bind:input="__e" class="translate" vue-id="5c0c0102-2" inputBorder="{{false}}" placeholderStyle="fontSize:16px" type="textarea" autoHeight="{{true}}" value="{{resultText}}" data-event-opts="{{[['^input',[['__set_model',['','resultText','$event',[]]]]]]}}" bind:__l="__l"></uni-easyinput></block></view></view><view data-event-opts="{{[['tap',[['chooseImage']]]]}}" class="btn container-fluid" bindtap="__e"><view><image class="img" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-camera.png" mode="widthFix"></image></view><view class="text">图片翻译</view></view><view class="btnText">上传/拍照</view><u-picker vue-id="5c0c0102-3" show="{{fromShow}}" columns="{{fromRange}}" keyName="label" closeOnClickOverlay="{{true}}" data-event-opts="{{[['^confirm',[['changeFrom']]],['^cancel',[['e3']]],['^close',[['e4']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:close="__e" bind:__l="__l"></u-picker><u-picker vue-id="5c0c0102-4" show="{{toShow}}" columns="{{toRange}}" keyName="label" closeOnClickOverlay="{{true}}" data-event-opts="{{[['^confirm',[['changeTo']]],['^cancel',[['e5']]],['^close',[['e6']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:close="__e" bind:__l="__l"></u-picker></view>
\ No newline at end of file
+<view class="v-pages-translate"><view class="v-translate-bg"></view><view class="v-translate-card container-fluid v-translate-box"><view class="row select flex-align-center"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['col','row','select-item','flex-align-center','left',exchange?'right-to-left':'left-to-right']}}" bindtap="__e"><text class="col">{{ActiveFrom.label}}</text><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate-down.png"></image></view><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="exchange" bindtap="__e"><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate.png"></image></view><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="{{['col','row','select-item','flex-align-center','right',exchange?'left-to-right':'right-to-left']}}" bindtap="__e"><text class="col">{{ActiveTo.label}}</text><image class="img" mode="widthFix" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-translate-down.png"></image></view></view><view class="p-l-24 p-r-24"><uni-easyinput class="translate" vue-id="5c0c0102-1" inputBorder="{{false}}" placeholderStyle="fontSize:16px" type="textarea" placeholder="请输入翻译内容" value="{{ActiveText}}" data-event-opts="{{[['^confirm',[['gotoTranslate']]],['^input',[['__set_model',['','ActiveText','$event',[]]]]]]}}" bind:confirm="__e" bind:input="__e" bind:__l="__l"></uni-easyinput></view><view class="result"><zero-markdown-view vue-id="5c0c0102-2" markdown="{{resultText}}" bind:__l="__l"></zero-markdown-view></view></view><view data-event-opts="{{[['tap',[['chooseImage']]]]}}" class="btn container-fluid" bindtap="__e"><view><image class="img" src="https://eluyou.ailuquan.cn/upload/image/2024/mapIcon/daolan/icon-camera.png" mode="widthFix"></image></view><view class="text">图片翻译</view></view><view class="btnText">上传/拍照</view><u-picker vue-id="5c0c0102-3" show="{{fromShow}}" columns="{{fromRange}}" keyName="label" closeOnClickOverlay="{{true}}" data-event-opts="{{[['^confirm',[['changeFrom']]],['^cancel',[['e3']]],['^close',[['e4']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:close="__e" bind:__l="__l"></u-picker><u-picker vue-id="5c0c0102-4" show="{{toShow}}" columns="{{toRange}}" keyName="label" closeOnClickOverlay="{{true}}" data-event-opts="{{[['^confirm',[['changeTo']]],['^cancel',[['e5']]],['^close',[['e6']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:close="__e" bind:__l="__l"></u-picker></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxss b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxss
index 744dd12..51b1a6a 100644
--- a/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxss
@@ -97,12 +97,18 @@
 }
 .v-pages-translate .result {
   border-top: 1rpx solid #f0f0f0;
-  padding: 24rpx;
   color: #0983ff;
   font-weight: bold;
   max-height: 40vh;
   overflow-y: auto;
 }
+.v-pages-translate .result .zero-markdown-view {
+  font-size: 32rpx;
+  color: #0983ff;
+}
+.v-pages-translate .result rich-text {
+  font-size: 32rpx !important;
+}
 .v-pages-translate .btn {
   height: 200rpx;
   width: 200rpx;
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
index b6e44f9..227d650 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss
@@ -65,7 +65,7 @@
 }
 .uni-easyinput__placeholder-class {
   color: #999;
-  font-size: 12px;
+  font-size: 14px;
 }
 .is-textarea {
   align-items: flex-start;