merge confilct
Showing
82 changed files
with
2620 additions
and
21 deletions
api/base.js
0 → 100644
components/uni-icon/readme.md
0 → 100644
components/uni-icon/uni-icon.vue
0 → 100644
This diff is collapsed.
Click to expand it.
components/uni-pagination/readme.md
0 → 100644
components/uni-pagination/uni-pagination.vue
0 → 100644
package-lock.json
0 → 100644
This diff could not be displayed because it is too large.
pages/conditionList/gateList.vue
0 → 100644
pages/conditionList/mallList.vue
0 → 100644
pages/conditionList/multiGateList.vue
0 → 100644
pages/conditionList/multiMallList.vue
0 → 100644
pages/conditionList/typeList.vue
0 → 100644
pages/passenger/condition.vue
0 → 100644
pages/passenger/groupTimeCondition.vue
0 → 100644
pages/passenger/img/default.png
0 → 100644
3.08 KB
pages/passenger/img/female.png
0 → 100644
2.75 KB
pages/passenger/img/male.png
0 → 100644
2.31 KB
store/dateData.js
0 → 100644
store/getter.js
0 → 100644
store/index.js
0 → 100644
store/modules/condition.js
0 → 100644
store/modules/malls.js
0 → 100644
This diff is collapsed.
Click to expand it.
store/mutation-types.js
0 → 100644
store/mutation.js
0 → 100644
store/state.js
0 → 100644
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
-
Please register or sign in to post a comment