Commit 4a37165b491ab3bbc8784b8ba9a47819df227dac
Exists in
master
style:解决冲突
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 147 changed files
- PagesA/Intelligent/index.vue
- PagesA/cardscanning/index.vue
- PagesA/gentfiling/index.vue
- PagesA/lnterpolation/index.vue
- PagesA/mapLIst/map.vue
- PagesB/detailPages/detailPages.vue
- PagesB/taskdetails/taskdetails.vue
- manifest.json
- package-lock.json
- package.json
- pages.json
- pages/Intelligent/index.vue
- pages/accredit/accredit.vue
- pages/cardscanning/index.vue
- pages/gentfiling/index.vue
- pages/home/index.vue
- pages/index/index.vue
- pages/lnformation/index.vue
- pages/lnterpolation/index.vue
- pages/taskdetails/taskdetails.vue
- pnpm-lock.yaml
- request/request.js
- static/baishijz.png
- static/chengg.png
- static/lindang.png
- static/shijian.png
- static/toes.png
- static/tuceng.png
- static/weixin.png
- static/wu.png
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/Intelligent/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/cardscanning/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/common/vendor.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/gentfiling/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/lnterpolation/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesA/mapLIst/map.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesB/detailPages/detailPages.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/PagesB/taskdetails/taskdetails.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/Intelligent/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/accredit/accredit.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/cardscanning/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/detailPages/detailPages.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/gentfiling/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/lnformation/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/lnterpolation/index.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/mapLIst/map.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/taskdetails/detailPages.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/pages/taskdetails/taskdetails.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
- unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
- unpackage/dist/dev/mp-weixin/PagesA/Intelligent/index.js
- unpackage/dist/dev/mp-weixin/PagesA/Intelligent/index.wxml
- unpackage/dist/dev/mp-weixin/PagesA/Intelligent/index.wxss
- unpackage/dist/dev/mp-weixin/PagesA/cardscanning/index.js
- unpackage/dist/dev/mp-weixin/PagesA/cardscanning/index.wxml
- unpackage/dist/dev/mp-weixin/PagesA/cardscanning/index.wxss
- unpackage/dist/dev/mp-weixin/PagesA/common/vendor.js
- unpackage/dist/dev/mp-weixin/PagesA/gentfiling/index.js
- unpackage/dist/dev/mp-weixin/PagesA/gentfiling/index.wxml
- unpackage/dist/dev/mp-weixin/PagesA/gentfiling/index.wxss
- unpackage/dist/dev/mp-weixin/PagesA/lnterpolation/index.js
- unpackage/dist/dev/mp-weixin/PagesA/lnterpolation/index.wxml
- unpackage/dist/dev/mp-weixin/PagesA/lnterpolation/index.wxss
- unpackage/dist/dev/mp-weixin/PagesA/mapLIst/map.js
- unpackage/dist/dev/mp-weixin/PagesA/mapLIst/map.wxml
- unpackage/dist/dev/mp-weixin/PagesA/mapLIst/map.wxss
- unpackage/dist/dev/mp-weixin/PagesB/detailPages/detailPages.js
- unpackage/dist/dev/mp-weixin/PagesB/detailPages/detailPages.wxml
- unpackage/dist/dev/mp-weixin/PagesB/detailPages/detailPages.wxss
- unpackage/dist/dev/mp-weixin/PagesB/taskdetails/taskdetails.js
- unpackage/dist/dev/mp-weixin/PagesB/taskdetails/taskdetails.wxml
- unpackage/dist/dev/mp-weixin/PagesB/taskdetails/taskdetails.wxss
- unpackage/dist/dev/mp-weixin/app.json
- unpackage/dist/dev/mp-weixin/common/main.js
- unpackage/dist/dev/mp-weixin/common/runtime.js
- unpackage/dist/dev/mp-weixin/common/vendor.js
- unpackage/dist/dev/mp-weixin/pages/Intelligent/index.js
- unpackage/dist/dev/mp-weixin/pages/Intelligent/index.json
- unpackage/dist/dev/mp-weixin/pages/Intelligent/index.wxml
- unpackage/dist/dev/mp-weixin/pages/Intelligent/index.wxss
- unpackage/dist/dev/mp-weixin/pages/accredit/accredit.js
- unpackage/dist/dev/mp-weixin/pages/accredit/accredit.json
- unpackage/dist/dev/mp-weixin/pages/accredit/accredit.wxml
- unpackage/dist/dev/mp-weixin/pages/accredit/accredit.wxss
- unpackage/dist/dev/mp-weixin/pages/cardscanning/camera.js
- unpackage/dist/dev/mp-weixin/pages/cardscanning/camera.json
- unpackage/dist/dev/mp-weixin/pages/cardscanning/camera.wxml
- unpackage/dist/dev/mp-weixin/pages/cardscanning/camera.wxss
- unpackage/dist/dev/mp-weixin/pages/cardscanning/index.js
- unpackage/dist/dev/mp-weixin/pages/cardscanning/index.json
- unpackage/dist/dev/mp-weixin/pages/cardscanning/index.wxml
- unpackage/dist/dev/mp-weixin/pages/cardscanning/index.wxss
- unpackage/dist/dev/mp-weixin/pages/gentfiling/index.js
- unpackage/dist/dev/mp-weixin/pages/gentfiling/index.json
- unpackage/dist/dev/mp-weixin/pages/gentfiling/index.wxml
- unpackage/dist/dev/mp-weixin/pages/gentfiling/index.wxss
- unpackage/dist/dev/mp-weixin/pages/gentfiling/viodes.js
- unpackage/dist/dev/mp-weixin/pages/gentfiling/viodes.json
- unpackage/dist/dev/mp-weixin/pages/gentfiling/viodes.wxml
- unpackage/dist/dev/mp-weixin/pages/gentfiling/viodes.wxss
- unpackage/dist/dev/mp-weixin/pages/home/index.js
- unpackage/dist/dev/mp-weixin/pages/home/index.json
- unpackage/dist/dev/mp-weixin/pages/home/index.wxml
- unpackage/dist/dev/mp-weixin/pages/home/index.wxss
- unpackage/dist/dev/mp-weixin/pages/index/index.js
- unpackage/dist/dev/mp-weixin/pages/index/index.json
- unpackage/dist/dev/mp-weixin/pages/index/index.wxml
- unpackage/dist/dev/mp-weixin/pages/index/index.wxss
- unpackage/dist/dev/mp-weixin/pages/lnformation/index.js
- unpackage/dist/dev/mp-weixin/pages/lnformation/index.wxml
- unpackage/dist/dev/mp-weixin/pages/lnformation/index.wxss
- unpackage/dist/dev/mp-weixin/pages/lnterpolation/index.js
- unpackage/dist/dev/mp-weixin/pages/lnterpolation/index.json
- unpackage/dist/dev/mp-weixin/pages/lnterpolation/index.wxml
- unpackage/dist/dev/mp-weixin/pages/lnterpolation/index.wxss
- unpackage/dist/dev/mp-weixin/pages/taskdetails/taskdetails.js
- unpackage/dist/dev/mp-weixin/pages/taskdetails/taskdetails.wxml
- unpackage/dist/dev/mp-weixin/pages/taskdetails/taskdetails.wxss
- unpackage/dist/dev/mp-weixin/project.private.config.json
- unpackage/dist/dev/mp-weixin/static/baishijz.png
- unpackage/dist/dev/mp-weixin/static/chengg.png
- unpackage/dist/dev/mp-weixin/static/lindang.png
- unpackage/dist/dev/mp-weixin/static/shijian.png
- unpackage/dist/dev/mp-weixin/static/toes.png
- unpackage/dist/dev/mp-weixin/static/tuceng.png
- unpackage/dist/dev/mp-weixin/static/weixin.png
- unpackage/dist/dev/mp-weixin/static/wu.png
- unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js
- unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js
- unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js
- unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxml
- unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxss
- unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
- unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml
- utils/amap-wx.130.js
- utils/qqmap-wx-jssdk.js