lu_quan_dev
han 10 months ago
parent 250e13116c
commit 1e16e86d1e
  1. 2
      subPageA/shop/shopList/shopList.vue
  2. 15
      subPageC/bookHomestay/bookHomestay.vue
  3. 5
      subPageC/bookShop/bookShop.vue
  4. 1
      subPageC/orderHomestay/orderDetail.vue
  5. 1
      subPageC/orderHomestay/orderList.vue
  6. 7
      subPageC/orderShop/orderDetail.vue
  7. 11
      subPageC/orderShop/orderList.vue
  8. 20
      subPageC/translate/index.vue
  9. 2
      uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue
  10. 4
      unpackage/dist/dev/mp-weixin/subPageA/components/sy-audio/sy-audio.json
  11. 4
      unpackage/dist/dev/mp-weixin/subPageA/components/xi-waterfall/xi-waterfall.json
  12. 2
      unpackage/dist/dev/mp-weixin/subPageA/shop/shopList/shopList.wxss
  13. 2
      unpackage/dist/dev/mp-weixin/subPageC/translate/index.js
  14. 2
      unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxml
  15. 8
      unpackage/dist/dev/mp-weixin/subPageC/translate/index.wxss
  16. 2
      unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.wxss

@ -120,7 +120,7 @@
<style lang="scss"> <style lang="scss">
.v-shop-list { .v-shop-list {
padding: 0 24rpx; padding: 24rpx;
flex-wrap: wrap; flex-wrap: wrap;
margin-left: -24rpx; margin-left: -24rpx;

@ -180,7 +180,7 @@
this.$Request.post(this.$config.createHotelOrder, data, 'json', null, false, true).then(( this.$Request.post(this.$config.createHotelOrder, data, 'json', null, false, true).then((
res) => { res) => {
if (res.code == 0) { if (res.code == 0) {
this.orderPay = res.data this.orderPay = res.data
this.payOrder() this.payOrder()
} else if (res.code == 600) { } else if (res.code == 600) {
uni.showToast({ uni.showToast({
@ -213,7 +213,7 @@
uni.showToast({ uni.showToast({
title: '支付成功', title: '支付成功',
icon: 'none' icon: 'none'
}); });
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ uni.redirectTo({
url: "/subPageC/orderHomestay/orderList" url: "/subPageC/orderHomestay/orderList"
@ -234,7 +234,7 @@
} }
//uni.showToast({title: data.detail.errMsg,icon:'none'}); //uni.showToast({title: data.detail.errMsg,icon:'none'});
}, },
closePay() { closePay() {
let that = this let that = this
uni.showModal({ uni.showModal({
@ -243,23 +243,22 @@
cancelText: '再想想', cancelText: '再想想',
showCancel: true, showCancel: true,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ uni.redirectTo({
url: "/subPageC/orderHomestay/orderList" url: "/subPageC/orderHomestay/orderList"
}); });
that.isPayPopup = false
}, 500) }, 500)
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
that.isPayPopup = false
} }
} }
}) })
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

@ -204,15 +204,14 @@
showCancel: true, showCancel: true,
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
that.isPayPopup = false
setTimeout(() => { setTimeout(() => {
uni.redirectTo({ uni.redirectTo({
url: "/subPageC/orderShop/orderList" url: "/subPageC/orderShop/orderList"
}); });
that.isPayPopup = false
}, 500) }, 500)
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
that.isPayPopup = false
} }
} }
}) })
@ -262,4 +261,4 @@
font-weight: bold; font-weight: bold;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
</style> </style>

@ -352,7 +352,6 @@
that.isPayPopup = false that.isPayPopup = false
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
this.isPayPopup=false
} }
} }
}) })

@ -205,7 +205,6 @@
that.isPayPopup = false that.isPayPopup = false
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
this.isPayPopup = false
} }
} }
}) })

@ -24,7 +24,7 @@
<view class="col-12"> <view class="col-12">
<view class="cancel-btn" @click="cacelOrder">取消订单</view> <view class="cancel-btn" @click="cacelOrder">取消订单</view>
</view> </view>
</view> </view>
<!-- <view v-if="homestayOrderData.orderStatus != '0' && homestayOrderData.orderStatus !='1'"> <!-- <view v-if="homestayOrderData.orderStatus != '0' && homestayOrderData.orderStatus !='1'">
<view class="pay-btn">再次预订</view> <view class="pay-btn">再次预订</view>
</view> --> </view> -->
@ -347,7 +347,6 @@
that.isPayPopup = false that.isPayPopup = false
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
this.isPayPopup = false
} }
} }
}) })
@ -652,7 +651,7 @@
font-size: 24rpx; font-size: 24rpx;
color: #808080; color: #808080;
} }
.num-price { .num-price {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 24rpx; font-size: 24rpx;
@ -754,4 +753,4 @@
font-weight: bold; font-weight: bold;
} }
} }
</style> </style>

@ -8,9 +8,9 @@
<view class="item_image"> <view class="item_image">
<image class="img" :src="item.picUrls" mode="widthFix"></image> <image class="img" :src="item.picUrls" mode="widthFix"></image>
</view> </view>
<view class="item_content col"> <view class="item_content col">
<view class="content-date">{{item.goodsName}}¥{{item.goodsPrice}} <view class="content-date">{{item.goodsName}}¥{{item.goodsPrice}}
* *
{{item.goodsNum}} {{item.goodsNum}}
</view> </view>
<view class="content-price">总价¥{{item.orderAmount}}</view> <view class="content-price">总价¥{{item.orderAmount}}</view>
@ -18,10 +18,10 @@
</view> </view>
<view class="item_content"> <view class="item_content">
<view class="content-bottom"> <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 class="btn" v-if="item.refundDisplay =='1'" @click="toRefundPage(item.id)">退款进度</view>
</view> </view>
</view> </view>
<view class="tip-state m-t-12" v-if="item.orderStatus=='1'">等待商家接单中请及时关注订单状态</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 class="state" :class="'type'+item.orderStatus">{{stateMessage(item.orderStatus)}}</view>
</view> </view>
@ -179,7 +179,6 @@ export default {
that.isPayPopup = false that.isPayPopup = false
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击取消'); console.log('用户点击取消');
this.isPayPopup=false
} }
} }
}) })
@ -224,7 +223,7 @@ export default {
.item_title { .item_title {
margin-top: -5rpx; margin-top: -5rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
font-size: 32rpx; font-size: 32rpx;
color: #1B1B1B; color: #1B1B1B;
font-weight: bold; font-weight: bold;

@ -28,8 +28,7 @@
</view> </view>
<view class="result"> <view class="result">
<uni-easyinput class="translate" :inputBorder="false" placeholderStyle="fontSize:16px" type="textarea" <zero-markdown-view :markdown="resultText"></zero-markdown-view>
v-model="resultText" :autoHeight="true" v-if="resultText"></uni-easyinput>
</view> </view>
</view> </view>
@ -188,8 +187,7 @@
title: '识别成功', title: '识别成功',
icon: 'success', icon: 'success',
duration: 1000 duration: 1000
}) })
console.log('识别成功恩子', res.data)
if (data.data !== null) { if (data.data !== null) {
data.data.forEach((item) => { data.data.forEach((item) => {
this.ActiveText = this.ActiveText + item.words + this.ActiveText = this.ActiveText + item.words +
@ -249,14 +247,13 @@
} }
} }
this.$Request.get(this.$config.getTtranslate, queryParams, "", "", false, true) this.$Request.get(this.$config.getTtranslate, queryParams, "", "", false, true)
.then(res => { .then(res => {
console.log('this.ActiveText',this.ActiveText)
if (res.data !== null) { if (res.data !== null) {
this.resultText = res.data this.resultText = res.data.replaceAll('\n', '</br>');
console.log('this.resultText',this.resultText)
} else { } else {
this.resultText = this.ActiveText this.resultText = this.ActiveText.replaceAll('\n', '</br>');
} }
console.log(this.resultText)
}) })
} }
}, },
@ -357,12 +354,13 @@
} }
.result { .result {
border-top: 1rpx solid #f0f0f0; border-top: 1rpx solid #f0f0f0;
padding: 24rpx;
color: #0983ff; color: #0983ff;
font-weight: bold; font-weight: bold;
max-height: 40vh; max-height: 40vh;
overflow-y: auto; overflow-y: auto;
.zero-markdown-view{font-size: 32rpx; color: #0983ff;}
rich-text{font-size: 32rpx!important;}
} }
.btn { .btn {

@ -581,7 +581,7 @@
.uni-easyinput__placeholder-class { .uni-easyinput__placeholder-class {
color: #999; color: #999;
font-size: 12px; font-size: 14px;
// font-weight: 200; // font-weight: 200;
} }

@ -1,4 +1,4 @@
{ {
"component": true, "usingComponents": {},
"usingComponents": {} "component": true
} }

@ -1,4 +1,4 @@
{ {
"component": true, "usingComponents": {},
"usingComponents": {} "component": true
} }

@ -25,7 +25,7 @@
/* 透明度 */ /* 透明度 */
/* 文章场景相关 */ /* 文章场景相关 */
.v-shop-list { .v-shop-list {
padding: 0 24rpx; padding: 24rpx;
flex-wrap: wrap; flex-wrap: wrap;
margin-left: -24rpx; margin-left: -24rpx;
} }

File diff suppressed because one or more lines are too long

@ -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> <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>

@ -97,12 +97,18 @@
} }
.v-pages-translate .result { .v-pages-translate .result {
border-top: 1rpx solid #f0f0f0; border-top: 1rpx solid #f0f0f0;
padding: 24rpx;
color: #0983ff; color: #0983ff;
font-weight: bold; font-weight: bold;
max-height: 40vh; max-height: 40vh;
overflow-y: auto; 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 { .v-pages-translate .btn {
height: 200rpx; height: 200rpx;
width: 200rpx; width: 200rpx;

@ -65,7 +65,7 @@
} }
.uni-easyinput__placeholder-class { .uni-easyinput__placeholder-class {
color: #999; color: #999;
font-size: 12px; font-size: 14px;
} }
.is-textarea { .is-textarea {
align-items: flex-start; align-items: flex-start;

Loading…
Cancel
Save