SH-Arbitrate/miniapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改冲突 #27

Merged
gaogaoyujie merged 2 commits from gyj into dev 2024-02-19 01:24:13 +00:00
Conversation 0 Commits 2 Files Changed 2
+8 -8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/handlecase/component/list.vue
+1 -1
View File
@@ -64,7 +64,7 @@
export default { export default {
data() { data() {
return { return {
} }
}, },
props: { props: {
pages/handlecase/component/newlyAddedCase.vue
+7 -7
View File
@@ -163,9 +163,9 @@
@tap="cencalBut">取消</button> @tap="cencalBut">取消</button>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById} from '../../../api/handlecase/index.js' import {getTemplate,getInfoByIdCard,caseApplicationInsert,updateComfire,caseApplicationSelectById} from '../../../api/handlecase/index.js'
import { import {
@@ -381,14 +381,14 @@
this.$refs.form.setRules(this.rules) this.$refs.form.setRules(this.rules)
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
background-color: #ffffff; background-color: #ffffff;
} }
.assignrbitrators{ .assignrbitrators{
margin: 30rpx; margin: 30rpx;
} }
</style> </style>