Compare commits

..

No commits in common. "164f03fd5e317b14dafbe0044ce0ce4a120a49d2" and "f0e0102c9efab32d8b95cd83068ee5be4434ced5" have entirely different histories.

2 changed files with 6 additions and 13 deletions

View File

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

View File

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