From 7adfe5210fad2b4ab1b1be41e2d58eb3dd9b2b1a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 02 四月 2024 09:38:22 +0800
Subject: [PATCH] 代码合并
---
packageBookService/pages/bookServices/detail/components/tree/index.js | 7 +++
packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml | 63 ++++++++++++++++++++++---------
packageBookService/pages/bookServices/detail/components/suggest/suggest.js | 2
3 files changed, 52 insertions(+), 20 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
index e12a9ac..0414fef 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.js
@@ -16,7 +16,7 @@
},
data: {
- inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx;font-size: 24rpx;',
+ inputStyle: 'border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx; padding:16rpx;',
placeholderstyle: 'font-size:28rpx',
dialogKey: '',
showWithInput: false,
diff --git a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
index 92262ab..f0c3f46 100644
--- a/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
+++ b/packageBookService/pages/bookServices/detail/components/suggest/suggest.wxml
@@ -1,33 +1,60 @@
-<!-- <t-dialog visible="{{showWithInput}}" title="鎴戣寤鸿" confirm-btn="纭畾" cancel-btn="鍙栨秷" bind:confirm="confirmSuggest" bind:cancel="closeDialog" class="suggest-dialog">
- <view slot="content">
- <view class="demo-rate">
- <view class="demo-rate__title">璇勫垎</view>
- <t-rate value="{{ratevalue}}" catch:change="onChangeRate" />
- </view>
- <t-input clearable value="{{inputvalue}}" slot="content" label="鑱旂郴鏂瑰紡" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" placeholder-class="placeholder" bind:change="inputChange" type="number" maxlength="{{11}}" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" />
- <t-textarea value="{{textvalue}}" t-class="external-class" label="鎰忚鍙嶉" placeholder="璇疯緭鍏ュ唴瀹�" maxcharacter="200" disableDefaultPadding="{{true}}" indicator bind:change="textareaChange" />
- </view>
-</t-dialog> -->
-<!-- <view class="suggest"> -->
-<t-popup visible="{{showWithInput}}" bind:visible-change="onVisibleChange" placement="center">
+<t-popup
+ visible="{{showWithInput}}"
+ bind:visible-change="onVisibleChange"
+ placement="center"
+>
<view class="top-icon">
<t-image src="/static/images/bookService/detail/feedback.png"></t-image>
</view>
<view slot="content" class="content">
<view class="top-title">鎴戣寤鸿</view>
<view class="demo-rate">
- <t-rate value="{{ratevalue}}" catch:change="onChangeRate" size="{{30}}" color="#FFB400" />
+ <t-rate
+ value="{{ratevalue}}"
+ catch:change="onChangeRate"
+ size="{{30}}"
+ color="#FFB400"
+ />
</view>
<view class="phone-input">
- <t-input clearable value="{{inputvalue}}" slot="content" label="" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" bind:change="inputChange" type="number" maxlength="{{11}}" class="phone" style="{{inputStyle}}" />
+ <t-input
+ clearable
+ value="{{inputvalue}}"
+ slot="content"
+ label=""
+ placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+ bind:change="inputChange"
+ type="number"
+ maxlength="{{11}}"
+ class="phone"
+ style="{{inputStyle}}"
+ />
</view>
<view style="width: 100%">
- <t-textarea value="{{textvalue}}" t-class="external-class" label="" placeholder="璇疯緭鍏ュ弽棣堝唴瀹�" maxcharacter="200" disableDefaultPadding="{{true}}" indicator bind:change="textareaChange" style="{{inputStyle}}" placeholder-style="{{placeholderstyle}}" />
+ <t-textarea
+ value="{{textvalue}}"
+ t-class="external-class"
+ label=""
+ placeholder="璇疯緭鍏ュ弽棣堝唴瀹�"
+ maxcharacter="200"
+ disableDefaultPadding="{{true}}"
+ indicator
+ bind:change="textareaChange"
+ style="{{inputStyle}}"
+ placeholder-style="{{placeholderstyle}}"
+ />
</view>
</view>
<view class="submit-btn">
- <t-button theme="primary" size="large" block bind:tap="confirmSuggest">鎻愪氦</t-button>
+ <t-button theme="primary" size="large" block bind:tap="confirmSuggest"
+ >鎻愪氦</t-button
+ >
</view>
- <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="closeDialog" />
+ <t-icon
+ t-class="close-btn"
+ name="close-circle"
+ size="32"
+ color="#fff"
+ bind:tap="closeDialog"
+ />
</t-popup>
-<!-- </view> -->
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index e2395d2..89245ce 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -142,10 +142,15 @@
}
})
} else {
- if (this.properties.isShowCheck) return true
const item = e.currentTarget.dataset.item
const parent = e.currentTarget.dataset.parent
let url
+ if (this.properties.isShowCheck && this.resourceIsBuy(item)) {
+ return wx.showToast({
+ icon: 'error',
+ title: "璇峰厛璐拱璧勬簮"
+ })
+ }
if (item.selectType == 'video' || item.learnSelectType == 'video') {
url = '/packageDomain/pages/resourceDetails/myVideo/index'
} else if (item.selectType == 'audio' || item.learnSelectType == 'audio') {
--
Gitblit v1.9.1