修改样式

pages/index/game/myOrder.vue

@@ -21,8 +21,7 @@
 				</view> -->
 				<view class="margin-top-sm padding-bottom-sm" style="border-top: 2rpx solid #F5F5F2;">
 					<view class="text-bold text-df padding-tb-xs">适用说明</view>
-					<view class="text-sm " style="color: #666666;">
+					<view class="text-sm " style="color: #666666;" v-html="order.content">
-						{{order.content}}
 					</view>
 				</view>
 				

pages/index/index.vue

@@ -543,6 +543,7 @@ export default {
 			isCashDeposit: 0,
 			loglattime: '',
 			loglataddress: '',
+			isJsjdsfxywl:false,//技师接单是否需要物料
 			switchList: [{
 				title: '在线',
 				value: true
@@ -686,6 +687,14 @@ export default {
 			}
 		});
 		// this.getcity()
+		
+		// 理疗师端首页是否弹框 380
+		this.$Request.get('/app/common/type/448').then(res => {
+			console.log('res448--->',res);
+			this.isJsjdsfxywl = res.data.value;
+		});
+		
+		
 	},
 	onShow() {
 		console.log(this.isLogin);
@@ -720,7 +729,7 @@ export default {
 		if (this.userId) {
 			console.log(this.userId, "dwdwadwdawd============>");
 			this.isLogin = true
-			// this.getJinRiOrder();
+			this.getJinRiOrder();
 			this.getUserInfo()
 			this.getFb()
 
@@ -983,9 +992,8 @@ export default {
 			});
 		},
 		stateSave() {
-			let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item
+			let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item.materialMinimum);
-				.materialMinimum);
+			if (!this.isTrue && materialPackageCountFlag && this.isJsjdsfxywl == '是') {
-			if (!this.isTrue && materialPackageCountFlag) {
 				this.$queue.showToast("当前剩余物料包数量不足，请检查");
 				return;
 			}