master #10

Merged
zhangyouji merged 9 commits from master into zyj 2024-04-19 09:22:15 +08:00
2 changed files with 2 additions and 3 deletions
Showing only changes of commit 91681c67e7 - Show all commits

View File

@@ -12,7 +12,7 @@
<view class="padding-bottom-sm">
油号选择
</view>
<view class="grid col-5 justify-start">
<view style="display:flex">
<view class="padding-xs" v-for="(item,index) in oilList" :key="index">
<button class="cu-btn" @tap="oilNameSel(item)" :class="[selected.otherOilsName===item.otherOilsName?'bg-main-oil':'line-gray']">{{item.otherOilsName}}</button>
</view>
@@ -30,7 +30,6 @@
油枪选择
</view>
<view class="grid col-5 justify-start">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
<button @tap="gunIdSel(index)" class="cu-btn" :class="[gunId===index?'bg-main-oil':'line-gray']">{{index+1}}</button>
</view>

View File

@@ -821,7 +821,7 @@
});
this.shake = null
}
}, 500)
}, 3000)
},
//福佑