护工工资

package_sub/order/orderDetail.vue

@@ -51,6 +51,10 @@
 						<image v-for="(item,index) in imgs" :src="item" @click="imgPreview(index)"></image>
 					</view>
 				</view>
+			</view>
+			<view class="info-item">
+				<text class="label">护工工资</text>
+				<text class="value">{{orderInfo.nurse_salary?orderInfo.nurse_salary:''}}</text>
 			</view>
 			<view class="info-item  info-item-reason">
 				<text class="label">其他需求</text>

package_sub/order/orderStaffDetail.vue

@@ -62,6 +62,10 @@
 						</view>
 					</view>
 				</view>
+				<view class="info-item">
+					<text class="label">护工工资</text>
+					<text class="value">{{orderInfo.nurse_salary?orderInfo.nurse_salary:''}}</text>
+				</view>
 				<view class="info-item  info-item-reason">
 					<text class="label">其他需求</text>
 					<text class="value">{{orderInfo.content?orderInfo.content:''}}</text>

package_sub/pages/AddOrder/AddOrder.vue

@@ -147,7 +147,12 @@
 									<u-radio :name="0">任意</u-radio>
 								</u-radio-group>
 							</view>
-						</u-form-item>
+						</u-form-item>
+						<u-form-item label="护工工资" prop="nurse_salary" required>
+							<u-input v-model="form.nurse_salary"  :disabled="!!orderId" type="number"
+								placeholder="请填写护工工资" />
+						</u-form-item>
+						
 					</view>
 
 					<view class="form-card form-card-2" v-if="form.type == 1">
@@ -359,7 +364,13 @@
 						<view class="desc-card__content--value" v-if="form.type == 1 || form.type == 2">
 							{{ sex(form.accompany_sex) }}
 						</view>
-						<br />
+						<br />
+						<view class="desc-card__content--title"> 护工工资 </view>
+						<view class="desc-card__content--value">
+							{{ form.nurse_salary }}
+						</view>
+						<br />
+						
 
 						<view class="desc-card__content--title"> 服务需求 </view>
 						<view class="desc-card__content--value"> {{ form.content || ' ' }} </view>
@@ -697,7 +708,8 @@
 					my_provide: 1,
 					appoint_name: "",
 					appoint_mobile: "",
-					accompany_sex: "",
+					accompany_sex: "",
+					nurse_salary:'',
 					file_ids: "",
 					content: "",
 					pay_status: 0,
@@ -746,12 +758,19 @@
 							// 触发器可以同时用blur和change
 							trigger: ["change", "blur"],
 						},
-					],
+					],
+					
+					nurse_salary: [{
+						required: true,
+						message: "请填写护工工资",
+						trigger: ["blur", "change"],
+					}],
 					content: [{
 						required: true,
 						message: "请填写其他服务需求",
 						trigger: ["blur", "change"],
-					}, ],
+					}],
+					
 					// site_id: [
 					//   {
 					//     required: true,

package_sub/pages/AddOrder/editOrder.vue

@@ -88,6 +88,9 @@
 								</u-radio-group>
 							</view>
 						</u-form-item>
+						<u-form-item label="护工工资" prop="nurse_salary" required>
+							<u-input v-model="form.nurse_salary" placeholder="请填写护工工资" type="number" />
+						</u-form-item>
 					</view>
 
 					<view class="form-card form-card-2" v-if="form.type == 1">
@@ -353,6 +356,7 @@
 					appoint_name: "",
 					appoint_mobile: "",
 					accompany_sex: "",
+					nurse_salary:"",
 					file_ids: "",
 					content: "",
 					pay_status: 0,
@@ -401,6 +405,11 @@
 							trigger: ["change", "blur"],
 						},
 					],
+					nurse_salary: [{
+						required: true,
+						message: "请填写护工工资",
+						trigger: ["blur", "change"],
+					}],
 				},
 				action: `${baseUrl}/api/mobile/upload-file`,
 				isAuth: false,

unpackage/dist/dev/mp-weixin/package_sub/login/login.wxml

@@ -1 +1 @@
-<view class="container data-v-6126915d"><image class="bkg data-v-6126915d" mode="aspectFill" src="../static/login-bg.png"></image><view class="login data-v-6126915d"><view class="login-title data-v-6126915d"><view class="data-v-6126915d">Hello</view><view class="data-v-6126915d">欢迎登录护工端</view></view><view class="login-form data-v-6126915d"><view class="data-v-6126915d"><u-input bind:input="__e" vue-id="78a7c96e-1" border-color="#f5f5f5" placeholder="请输入用户名" value="{{form.username}}" data-event-opts="{{[['^input',[['__set_model',['$0','username','$event',[]],['form']]]]]}}" class="data-v-6126915d" bind:__l="__l"></u-input></view><view class="data-v-6126915d"><u-input bind:input="__e" vue-id="78a7c96e-2" border-color="#f5f5f5" type="password" placeholder="请输入密码" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-6126915d" bind:__l="__l"></u-input></view></view><view class="role-select data-v-6126915d"><view class="role-title data-v-6126915d">请选择登录角色：</view><view class="role-options data-v-6126915d"><block wx:for="{{roleList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="role-item data-v-6126915d" bindtap="__e"><view class="{{['radio-box','data-v-6126915d',(form.role===item.value)?'active':'']}}"><block wx:if="{{form.role===item.value}}"><view class="radio-inner data-v-6126915d"></view></block></view><text class="role-label data-v-6126915d">{{item.label}}</text></view></block><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="role-item role-item-check data-v-6126915d" bindtap="__e"><view class="{{['radio-box','data-v-6126915d',(isRemeber)?'active':'']}}"><block wx:if="{{isRemeber}}"><view class="radio-inner data-v-6126915d"></view></block></view><text class="role-label data-v-6126915d">记住当前登录状态</text></view></view></view><view class="login-btn data-v-6126915d"><view data-event-opts="{{[['tap',[['login',['$event']]]]]}}" bindtap="__e" class="data-v-6126915d">立即登录</view></view><block wx:if="{{showPrivacyTip}}"><view class="privacy-tip data-v-6126915d"><view class="privacy-content data-v-6126915d"><view class="privacy-title data-v-6126915d">用户隐私保护指引</view><view class="privacy-text data-v-6126915d">为了向您提供更好的服务，我们需要获取您的个人信息。我们将严格遵守相关法律法规，保护您的隐私安全。</view><view data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="privacy-link data-v-6126915d" bindtap="__e">查看《用户隐私保护指引》</view><view class="privacy-buttons data-v-6126915d"><view data-event-opts="{{[['tap',[['handlePrivacyCancel',['$event']]]]]}}" class="privacy-btn cancel data-v-6126915d" bindtap="__e">暂不使用</view><view data-event-opts="{{[['tap',[['handlePrivacyConfirm',['$event']]]]]}}" class="privacy-btn confirm data-v-6126915d" bindtap="__e">同意并继续</view></view></view></view></block></view></view>
+<view class="container data-v-6126915d"><image class="bkg data-v-6126915d" mode="aspectFill" src="../static/login-bg.png"></image><view class="login data-v-6126915d"><view class="login-title data-v-6126915d"><view class="data-v-6126915d">Hello</view><view class="data-v-6126915d">欢迎登录护工端</view></view><view class="login-form data-v-6126915d"><view class="data-v-6126915d"><u-input bind:input="__e" vue-id="78a7c96e-1" border-color="#f5f5f5" placeholder="请输入用户名" value="{{form.username}}" data-event-opts="{{[['^input',[['__set_model',['$0','username','$event',[]],['form']]]]]}}" class="data-v-6126915d" bind:__l="__l"></u-input></view><view class="data-v-6126915d"><u-input bind:input="__e" vue-id="78a7c96e-2" border-color="#f5f5f5" type="password" placeholder="请输入密码" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-6126915d" bind:__l="__l"></u-input></view></view><view class="role-select data-v-6126915d"><view class="role-title data-v-6126915d">请选择登录角色：</view><view class="role-options data-v-6126915d"><block wx:for="{{roleList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="role-item data-v-6126915d" bindtap="__e"><view class="{{['radio-box','data-v-6126915d',(form.role===item.value)?'active':'']}}"><block wx:if="{{form.role===item.value}}"><view class="radio-inner data-v-6126915d"></view></block></view><text class="role-label data-v-6126915d">{{item.label}}</text></view></block><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="role-item role-item-check data-v-6126915d" bindtap="__e"><view class="{{['radio-box','data-v-6126915d',(isRemeber)?'active':'']}}"><block wx:if="{{isRemeber}}"><view class="radio-inner data-v-6126915d"></view></block></view><text class="role-label data-v-6126915d">记住当前登录状态</text></view></view></view><view class="login-btn data-v-6126915d"><view data-event-opts="{{[['tap',[['login',['$event']]]]]}}" bindtap="__e" class="data-v-6126915d">立即登录</view></view><block wx:if="{{showPrivacyTip}}"><view class="privacy-tip data-v-6126915d"><view class="privacy-content data-v-6126915d"><view class="privacy-title data-v-6126915d">用户隐私保护指引</view><view class="privacy-text data-v-6126915d"> 为了向您提供更好的服务，我们需要获取您的个人信息。我们将严格遵守相关法律法规，保护您的隐私安全。 </view><view data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="privacy-link data-v-6126915d" bindtap="__e"> 查看《用户隐私保护指引》 </view><view class="privacy-buttons data-v-6126915d"><view data-event-opts="{{[['tap',[['handlePrivacyCancel',['$event']]]]]}}" class="privacy-btn cancel data-v-6126915d" bindtap="__e">暂不使用</view><view data-event-opts="{{[['tap',[['handlePrivacyConfirm',['$event']]]]]}}" class="privacy-btn confirm data-v-6126915d" bindtap="__e">同意并继续</view></view></view></view></block></view></view>

unpackage/dist/dev/mp-weixin/package_sub/order/assignOrder.wxml

@@ -1 +1 @@
-<view class="assign-order-page data-v-38f3c378"><u-navbar vue-id="34f5a6e4-1" is-back="{{true}}" title="分配订单" background="{{$root.a0}}" title-color="#fff" border-bottom="{{false}}" class="data-v-38f3c378" bind:__l="__l"></u-navbar><view class="b-border data-v-38f3c378"></view><view class="nurse-list data-v-38f3c378"><view class="section-title data-v-38f3c378">选择护工</view><view class="search-box data-v-38f3c378"><u-search vue-id="34f5a6e4-2" placeholder="搜索护工姓名" value="{{searchKeyword}}" data-event-opts="{{[['^search',[['searchNurse']]],['^custom',[['searchNurse']]],['^input',[['__set_model',['','searchKeyword','$event',[]]]]]]}}" bind:search="__e" bind:custom="__e" bind:input="__e" class="data-v-38f3c378" bind:__l="__l"></u-search></view><scroll-view style="height:400rpx;" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMoreNurses',['$event']]]]]}}" bindscrolltolower="__e" class="data-v-38f3c378"><block wx:if="{{hasNurseList}}"><view class="nurse-items data-v-38f3c378"><block wx:for="{{$root.l0}}" wx:for-item="nurse" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['selectNurse',['$0'],[[['nurseList','id',nurse.$orig.id]]]]]]]}}" class="{{['data-v-38f3c378','nurse-item',[(selectedNurseId===nurse.$orig.id)?'active':'']]}}" bindtap="__e"><view class="nurse-avatar data-v-38f3c378"><u-avatar vue-id="{{'34f5a6e4-3-'+__i0__}}" src="{{nurse.m0}}" size="80" class="data-v-38f3c378" bind:__l="__l"></u-avatar></view><view class="nurse-info data-v-38f3c378"><view class="nurse-name data-v-38f3c378">{{nurse.$orig.name}}</view><view class="nurse-phone data-v-38f3c378">{{nurse.$orig.mobile}}</view></view><view class="nurse-select data-v-38f3c378"><block wx:if="{{selectedNurseId===nurse.$orig.id}}"><u-icon vue-id="{{'34f5a6e4-4-'+__i0__}}" name="checkmark-circle" color="#1479ff" size="40" class="data-v-38f3c378" bind:__l="__l"></u-icon></block></view></view></block></view></block><block wx:else><view class="empty-state data-v-38f3c378"><u-empty vue-id="34f5a6e4-5" mode="list" text="暂无护工" class="data-v-38f3c378" bind:__l="__l"></u-empty></view></block><block wx:if="{{hasNurseList}}"><u-loadmore vue-id="34f5a6e4-6" margin-top="{{20}}" margin-bottom="{{40}}" status="{{loadStatus}}" class="data-v-38f3c378" bind:__l="__l"></u-loadmore></block></scroll-view></view><view class="assign-btn-wrapper data-v-38f3c378"><u-button class="assign-btn data-v-38f3c378" vue-id="34f5a6e4-7" type="primary" shape="circle" disabled="{{!selectedNurseId}}" data-event-opts="{{[['^click',[['assignOrder']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">确认分配</u-button></view></view>
+<view class="assign-order-page data-v-38f3c378"><u-navbar vue-id="34f5a6e4-1" is-back="{{true}}" title="分配订单" background="{{$root.a0}}" title-color="#fff" border-bottom="{{false}}" class="data-v-38f3c378" bind:__l="__l"></u-navbar><view class="b-border data-v-38f3c378"></view><view class="nurse-list data-v-38f3c378"><view class="section-title data-v-38f3c378">选择护工</view><view class="search-box data-v-38f3c378"><u-search vue-id="34f5a6e4-2" placeholder="搜索护工姓名" value="{{searchKeyword}}" data-event-opts="{{[['^search',[['searchNurse']]],['^custom',[['searchNurse']]],['^input',[['__set_model',['','searchKeyword','$event',[]]]]]]}}" bind:search="__e" bind:custom="__e" bind:input="__e" class="data-v-38f3c378" bind:__l="__l"></u-search></view><scroll-view style="height:400rpx;" scroll-y="{{true}}" data-event-opts="{{[['scrolltolower',[['loadMoreNurses',['$event']]]]]}}" bindscrolltolower="__e" class="data-v-38f3c378"><block wx:if="{{hasNurseList}}"><view class="nurse-items data-v-38f3c378"><block wx:for="{{$root.l0}}" wx:for-item="nurse" wx:for-index="__i0__" wx:key="id"><view data-event-opts="{{[['tap',[['selectNurse',['$0'],[[['nurseList','id',nurse.$orig.id]]]]]]]}}" class="{{['data-v-38f3c378','nurse-item',[(selectedNurseId===nurse.$orig.id)?'active':'']]}}" bindtap="__e"><view class="nurse-avatar data-v-38f3c378"><u-avatar vue-id="{{'34f5a6e4-3-'+__i0__}}" src="{{nurse.m0}}" size="80" class="data-v-38f3c378" bind:__l="__l"></u-avatar></view><view class="nurse-info data-v-38f3c378"><view class="nurse-name data-v-38f3c378">{{nurse.$orig.name}}</view><view class="nurse-phone data-v-38f3c378">{{nurse.$orig.mobile}}</view></view><view class="nurse-select data-v-38f3c378"><block wx:if="{{selectedNurseId===nurse.$orig.id}}"><u-icon vue-id="{{'34f5a6e4-4-'+__i0__}}" name="checkmark-circle" color="#1479ff" size="40" class="data-v-38f3c378" bind:__l="__l"></u-icon></block></view></view></block></view></block><block wx:else><view class="empty-state data-v-38f3c378"><u-empty vue-id="34f5a6e4-5" mode="list" text="暂无护工" class="data-v-38f3c378" bind:__l="__l"></u-empty></view></block><block wx:if="{{hasNurseList}}"><u-loadmore vue-id="34f5a6e4-6" margin-top="{{20}}" margin-bottom="{{40}}" status="{{loadStatus}}" class="data-v-38f3c378" bind:__l="__l"></u-loadmore></block></scroll-view></view><view class="assign-btn-wrapper data-v-38f3c378"><u-button class="assign-btn data-v-38f3c378" vue-id="34f5a6e4-7" type="primary" shape="circle" disabled="{{!selectedNurseId}}" data-event-opts="{{[['^click',[['assignOrder']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"> 确认分配 </u-button></view></view>

unpackage/dist/dev/mp-weixin/package_sub/pages/ServiceDetail/ServiceDetail.wxml

@@ -1 +1 @@
-<view class="page safe-area-inset-bottom data-v-9eba20e8"><view class="bkg data-v-9eba20e8"><u-swiper vue-id="63bb82fa-1" height="{{316}}" img-mode="scaleToFill" mode="none" border-radius="0" list="{{info.images}}" name="url" class="data-v-9eba20e8" bind:__l="__l"></u-swiper></view><view class="container data-v-9eba20e8"><view class="card detail data-v-9eba20e8"><view class="detail__text data-v-9eba20e8">{{''+(info.introduce||' ')+''}}</view><view class="detail__price data-v-9eba20e8"><text class="detail__price--number data-v-9eba20e8">{{info.price}}</text><text class="detail__price--text data-v-9eba20e8">元起</text></view></view><view hidden="{{!(currentTab===0)}}" class="data-v-9eba20e8"><view class="service-flow card data-v-9eba20e8"><view class="card__title data-v-9eba20e8">服务流程</view><view class="service-flow__content data-v-9eba20e8"><u-parse vue-id="63bb82fa-2" html="{{info.flow_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view><view class="cost-description card data-v-9eba20e8"><view class="card__title data-v-9eba20e8">注意事项</view><view class="cost-description__content _ul data-v-9eba20e8"><u-parse vue-id="63bb82fa-3" html="{{info.price_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view></view><view hidden="{{!(currentTab===1)}}" class="data-v-9eba20e8"><view class="card for-people data-v-9eba20e8"><view class="for-people__content block data-v-9eba20e8"><view class="block-item data-v-9eba20e8"><view class="block-item__text data-v-9eba20e8"><u-parse vue-id="63bb82fa-4" html="{{info.appoint_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view></view></view></view><u-button class="btn data-v-9eba20e8" vue-id="63bb82fa-5" shape="circle" ripple="{{true}}" custom-style="{{orderBtnStyle}}" data-event-opts="{{[['^click',[['toOrder',['$0'],['info']]]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">立即预约</u-button></view></view>
+<view class="page safe-area-inset-bottom data-v-9eba20e8"><view class="bkg data-v-9eba20e8"><u-swiper vue-id="63bb82fa-1" height="{{316}}" img-mode="scaleToFill" mode="none" border-radius="0" list="{{info.images}}" name="url" class="data-v-9eba20e8" bind:__l="__l"></u-swiper></view><view class="container data-v-9eba20e8"><view class="card detail data-v-9eba20e8"><view class="detail__text data-v-9eba20e8">{{''+(info.introduce||' ')+''}}</view><view class="detail__price data-v-9eba20e8"><text class="detail__price--number data-v-9eba20e8">{{info.price}}</text><text class="detail__price--text data-v-9eba20e8">元起</text></view></view><view hidden="{{!(currentTab===0)}}" class="data-v-9eba20e8"><view class="service-flow card data-v-9eba20e8"><view class="card__title data-v-9eba20e8"> 服务流程 </view><view class="service-flow__content data-v-9eba20e8"><u-parse vue-id="63bb82fa-2" html="{{info.flow_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view><view class="cost-description card data-v-9eba20e8"><view class="card__title data-v-9eba20e8"> 注意事项 </view><view class="cost-description__content _ul data-v-9eba20e8"><u-parse vue-id="63bb82fa-3" html="{{info.price_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view></view><view hidden="{{!(currentTab===1)}}" class="data-v-9eba20e8"><view class="card for-people data-v-9eba20e8"><view class="for-people__content block data-v-9eba20e8"><view class="block-item data-v-9eba20e8"><view class="block-item__text data-v-9eba20e8"><u-parse vue-id="63bb82fa-4" html="{{info.appoint_content}}" class="data-v-9eba20e8" bind:__l="__l"></u-parse></view></view></view></view></view><u-button class="btn data-v-9eba20e8" vue-id="63bb82fa-5" shape="circle" ripple="{{true}}" custom-style="{{orderBtnStyle}}" data-event-opts="{{[['^click',[['toOrder',['$0'],['info']]]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}">立即预约</u-button></view></view>