Skip to content

J
jd-vx-app
Commit 3e80e835 authored by 肖健's avatar 肖健
Browse files
Options

Merge remote-tracking branch 'origin/master' into dev_cd 

# Conflicts:
#	main.js
#	pages/binding/binding.vue
#	pages/binding/index.vue
#	pagesB/pages/move-car/addCar.vue
#	pagesB/pages/move-car/loveCar.vue
#	pagesB/pages/move-car/myCall.vue
#	pagesB/pages/move-car/myMoveCar.vue
#	pagesB/pages/move-car/myRecord.vue
#	pagesC/pages/shop/index.vue
#	pagesC/pages/shop/pay.vue
#	pagesD/pages/personal/carTime.vue
#	pagesD/pages/personal/editAddress.vue
#	pagesD/pages/personal/myOrder.vue
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/active-form.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/radio.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/active-form/components/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-carnumber/codecook-carnumber.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/codecook-keyboard/codecook-keyboard.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/uview-ui/components/u-action-sheet/u-action-sheet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-badge/u-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-gap/u-gap.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-icon/u-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-input/u-input.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-line/u-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-modal/u-modal.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-picker/u-picker.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-popup/u-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-search/u-search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-switch/u-switch.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/uview-ui/components/u-transition/u-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/wxcomponents/custom-tarbar/custom-tarbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/binding.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/binding/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getCarCode.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/getPrice.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/addCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/callDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/editCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/loveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/moveCarDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myCall.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/myRecord.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/oneMoveCar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/recordDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/pages/move-car/scan.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/pay.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/payOk.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesC/pages/shop/search.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/addAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/ask.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/asking.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/carTime.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/editAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/help.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myAddress.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/myOrder.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/orderDetail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/pull.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pagesD/pages/personal/userInfo.js.map
#	unpackage/dist/dev/mp-weixin/app.json
#	unpackage/dist/dev/mp-weixin/common/active-form/active-form.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/checkbox.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/popup.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio-group.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/radio.js
#	unpackage/dist/dev/mp-weixin/common/active-form/components/select.js
#	unpackage/dist/dev/mp-weixin/common/codecook-carnumber/codecook-carnumber.js
#	unpackage/dist/dev/mp-weixin/common/codecook-keyboard/codecook-keyboard.js
#	unpackage/dist/dev/mp-weixin/common/codecook-keyboard/codecook-keyboard.wxss
#	unpackage/dist/dev/mp-weixin/common/main.js
#	unpackage/dist/dev/mp-weixin/common/runtime.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--form/u--form.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--input/u--input.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u--textarea/u--textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-action-sheet/u-action-sheet.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-badge/u-badge.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-checkbox/u-checkbox.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-datetime-picker/u-datetime-picker.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-form-item/u-form-item.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-form/u-form.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-icon/u-icon.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-input/u-input.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-line/u-line.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-loading-icon/u-loading-icon.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-modal/u-modal.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-overlay/u-overlay.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-picker/u-picker.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-popup/u-popup.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-safe-bottom/u-safe-bottom.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-search/u-search.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-status-bar/u-status-bar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-swiper/u-swiper.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-switch/u-switch.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-tabs/u-tabs.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-textarea/u-textarea.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.js
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-toolbar/u-toolbar.json
#	unpackage/dist/dev/mp-weixin/common/uview-ui/components/u-transition/u-transition.js
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.js
#	unpackage/dist/dev/mp-weixin/pages/binding/binding.wxml
#	unpackage/dist/dev/mp-weixin/pages/binding/index.js
#	unpackage/dist/dev/mp-weixin/pages/binding/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesA/pages/index/getPrice.wxss
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/addCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/loveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/loveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myCall.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myCall.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myMoveCar.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myMoveCar.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myRecord.js
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/myRecord.wxml
#	unpackage/dist/dev/mp-weixin/pagesB/pages/move-car/scan.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/index.wxml
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.js
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.wxml
#	unpackage/dist/dev/mp-weixin/pagesC/pages/shop/pay.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/addAddress.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/carTime.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/carTime.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/editAddress.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/editAddress.wxss
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.js
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/myOrder.wxml
#	unpackage/dist/dev/mp-weixin/pagesD/pages/personal/userInfo.js
parents 7d20cf58 d8023677
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2014 additions and 146 deletions
.DS_Store
View file @ 3e80e835
No preview for this file type
common/.DS_Store
View file @ 3e80e835
No preview for this file type
common/codecook-keyboard/codecook-keyboard.vue
View file @ 3e80e835
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
background-color: #F5F5F5; background-color: #F5F5F5;
z-index: 9999;
} }
.status-bar { .status-bar {
......
common/scroll-list/ remade.md 0 → 100644
View file @ 3e80e835
<!--
* @Author: euzhi
* @Description: 描述
-->
<!--
defaultOption: {
page: 1, // 分页
size: 15, // 分页大小
auto: true, // 自动加载
height: null, // 组件高度
disabled: false, // 禁用
background: '', // 背景颜色属性
emptyImage: '', // 空数据提示图片
offsetBottom: 0, // 底部高度补偿
pullDownSpeed: 0.5, // 下拉速率
lowerThreshold: 40, // 距离底部上拉加载距离
refresherThreshold: 80, // 距离顶部下拉刷新距离
refreshDelayed: 800, // 刷新延迟
refreshFinishDelayed: 800, // 刷新完成后的延迟
safeArea: false, // 是否开启安全区域适配
emptyTextColor: '#82848a', // 空提示文字颜色
loadTextColor: '#82848a', // 上拉加载文字颜色
loadIconColor: '#82848a', // 上拉加载图标颜色
refresherTextColor: '#82848a', // 下拉刷新文字颜色
refresherIconColor: '#82848a', // 下拉刷新图标颜色
emptyText: '暂无列表~', // 空数据提示文字
loadingText: '正在加载中~', // 加载中文字
loadFailText: '加载失败啦~', // 加载失败文字
noMoreText: '没有更多啦~', // 没有更多文字
refreshingText: '正在刷新~', // 正在刷新文字
refreshFailText: '刷新失败~', // 刷新失败文字
refreshSuccessText: '刷新成功~', // 刷新成功文字
pulldownText: '下拉刷新~', // 下拉中的文字
pulldownFinishText: '松开刷新~' // 下拉完成的文字
}
<template>
<view class="page-wrap">
<scroll-list ref="list" :option="option" @load="load" @refresh="refresh">
<view class="list-item" v-for="(item, index) in list" :key="index" @click="handleTest">
<view class="avatar">{{ index + 1 }}</view>
<view class="info">
<view class="info-item"></view>
<view class="info-item"></view>
</view>
</view>
</scroll-list>
</view>
</template>
<script>
export default {
data() {
return {
option: {
size: 5,
auto: true
},
};
},
onLoad() {
},
() {},
onHide() {},
methods: {
// 加载数据
load(paging) {
setTimeout(() => {
let list = [];
for (var i = 0; i < paging.size; i++) {
list.push(i);
}
this.list = [...this.list, ...list];
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({ list: this.list, total: 50 });
// 加载失败
// this.$refs.list.loadFail()
}, this.$u.random(100, 1000));
},
// 刷新刷剧
refresh(paging) {
setTimeout(() => {
let list = [];
for (var i = 0; i < paging.size; i++) {
list.push(i);
}
this.list = list;
// 刷新成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.refreshSuccess({ list: this.list, total: 50 });
// 刷新失败
// this.$refs.list.refreshFail()
}, this.$u.random(100, 1000));
}
}
};
</script>
-->
\ No newline at end of file
common/scroll-list/images.js 0 → 100644
View file @ 3e80e835
export default {
empty: 'data:image/png;base64,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',
success: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDQ4IDQ4IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxyZWN0IHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgZmlsbD0id2hpdGUiIGZpbGwtb3BhY2l0eT0iMC4wMSIvPjxwYXRoIGQ9Ik0xMCAyNEwyMCAzNEw0MCAxNCIgc3Ryb2tlPSIjMzAzMTMzIiBzdHJva2Utd2lkdGg9IjMiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPjwvc3ZnPg==',
error: 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDQ4IDQ4IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxyZWN0IHdpZHRoPSI0OCIgaGVpZ2h0PSI0OCIgZmlsbD0id2hpdGUiIGZpbGwtb3BhY2l0eT0iMC4wMSIvPjxwYXRoIGQ9Ik0xNCAxNEwzNCAzNCIgc3Ryb2tlPSIjMzAzMTMzIiBzdHJva2Utd2lkdGg9IjMiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPjxwYXRoIGQ9Ik0xNCAzNEwzNCAxNCIgc3Ryb2tlPSIjMzAzMTMzIiBzdHJva2Utd2lkdGg9IjMiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIvPjwvc3ZnPg=='
}
common/scroll-list/scroll-list.vue 0 → 100644
View file @ 3e80e835
This diff is collapsed.
main.js
View file @ 3e80e835
import Vue from 'vue' import Vue from 'vue'
import App from './App' import App from './App'
import uView from '@/common/uview-ui/index'; import uView from '@/common/uview-ui/index';
import store from "./store";
Vue.prototype.$store = store;
import http from "./common/api/api.js" import http from "./common/api/api.js"
Vue.config.productionTip = false Vue.config.productionTip = false
import ActiveForm from "@/common/active-form/active-form"; import ActiveForm from "@/common/active-form/active-form";
import scrollList from "@/common/scroll-list/scroll-list";
Vue.use(uView); Vue.use(uView);
Vue.prototype.http = http Vue.prototype.http = http
Vue.prototype.nc_templateid = '59-hfHg3CnDvgVEnjqxiHRFwpABehc5lZxHQeUctlrg' Vue.prototype.nc_templateid = '59-hfHg3CnDvgVEnjqxiHRFwpABehc5lZxHQeUctlrg'
App.mpType = 'app' App.mpType = 'app'
Vue.component('ActiveForm', ActiveForm) Vue.component('ActiveForm', ActiveForm)
Vue.component('scrollList', scrollList)
const app = new Vue({ const app = new Vue({
...App ...App
}) })
......
pages/binding/binding.vue
View file @ 3e80e835
...@@ -4,28 +4,28 @@ ...@@ -4,28 +4,28 @@
--> -->
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="bindingLogin"> <div class="bindingLogin">
<div class="login__logo"> <div class="login__logo">
<image src="@/static/binding/logo.png"> <image src="@/static/binding/logo.png">
</div>
<div class="binding__tips">
绑定京东账号后，免费领取挪车码
</div>
<div class="binding__form">
<view class="content">
<active-form :formDate.sync="formData"></active-form>
</view>
</div>
<div class="login__read">
<u-checkbox-group placement="row">
<u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group>
已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
</div>
<div>
<view class="subform" @click="sub">确认绑定</view>
</div>
</div> </div>
<div class="binding__tips">
绑定京东账号后，免费领取挪车码
</div>
<div class="binding__form">
<view class="content">
<active-form :formDate.sync="formData"></active-form>
</view>
</div>
<div class="login__read">
<u-checkbox-group placement="row">
<u-checkbox v-model="checked" ></u-checkbox>
</u-checkbox-group>
已阅读并同意<span>京东挪车牌用户协议（含隐私政策）</span>、<span>京东用户注册协议</span>、<span>京东隐私政策</span>和<span>联通账号认证服务条款</span>并使用本机号码登录
</div>
<div>
<view class="subform" @click="sub">确认绑定</view>
</div>
</div>
</view> </view>
</template> </template>
...@@ -64,50 +64,32 @@ export default { ...@@ -64,50 +64,32 @@ export default {
}; };
}, },
methods: { methods: {
changeBtn() {
this.checked = !this.checked;
},
// 提交表单 // 提交表单
sub() { sub() {
// this.$vervify(this.formData); //表单校验 成功会继续往下走 失败抛出异常 if (this.checked) {
// this.$vervify(this.formData); //表单校验 成功会继续往下走 失败抛出异常
// const res = this.$submitForm(this.formData); //校验成功 获取表单值 // const res = this.$submitForm(this.formData); //校验成功 获取表单值
console.log('表单对象 :>> ', this.formData); console.log('表单对象 :>> ', this.formData);
// uni.showToast({ // uni.showToast({
// title: "验证码过期", // title: "验证码过期",
// icon: 'error', // icon: 'error',
// duration: 2000, // duration: 2000,
// }); // });
//跳转到首页 //跳转到首页
uni.navigateTo({ uni.navigateTo({
url: '/pagesA/pages/index/index' url: '/pagesA/pages/index/index'
}); });
// let param = {"appId" : "6", "ids": [151], } else {
// "channelCode" : "wx_lite", "channelExtras" : {"openid" : "orQCF5W_Z6281tGMooVnSNE1yGog"}, uni.showToast({
// } title: "请阅读并同意京东挪车牌用户协议",
// let opts = { url: '/app/pay/order/submit/more', method: 'post' } icon: 'none',
duration: 2000,
// this.http.httpRequest(opts, param).then(res => { });
// console.log(res); }
// if (res.data.code == 200) {
// let paymentData = res.data.data.invokeResponse;
// uni.requestPayment({
// provider: 'wxpay', // 服务提提供商
// timeStamp: paymentData.timeStamp,
// nonceStr: paymentData.nonceStr,
// package: paymentData.packageValue,
// signType: paymentData.signType,
// paySign: paymentData.paySign,
// success: function (res) {
// console.log('支付成功',res);
// // 业务逻辑。。。
// },
// fail: function (err) {
// console.log('支付失败',err);
// },
// });
// } else {
// }
// })
}, },
}, },
} }
...@@ -148,7 +130,8 @@ export default { ...@@ -148,7 +130,8 @@ export default {
.u-checkbox-group { .u-checkbox-group {
display: inline-block !important; display: inline-block !important;
} }
/deep/.u-checkbox-group--row {
/deep/.u-checkbox-group--row {
display: inline-block !important; display: inline-block !important;
} }
......
pages/binding/index.vue
View file @ 3e80e835
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</view> --> </view> -->
<view v-if="isCanUse2"> <view v-if="isCanUse2">
<view> <view>
<button class="login__btn" hover-class="none" type='primary' open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"> <button class="login__btn" :disabled="!checked" hover-class="none" type='primary' open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
微信一键登录 微信一键登录
</button> </button>
</view> </view>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="login__read"> <div class="login__read">
<u-checkbox-group placement="row"> <u-checkbox-group placement="row">
<u-checkbox activeColor="green" v-model="checked"></u-checkbox> <u-checkbox :checked='checked' @change="changeBtn"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号 已阅读并同意 <span>《京东用户注册协议》</span>、<span>《京东隐私政策》</span>。若您的手机号未注册，将为您直接注册京东账号
</div> </div>
...@@ -55,6 +55,9 @@ export default { ...@@ -55,6 +55,9 @@ export default {
}; };
}, },
methods: { methods: {
changeBtn() {
this.checked = !this.checked;
},
//登录 //登录
login() { login() {
let _this = this; let _this = this;
...@@ -74,9 +77,9 @@ export default { ...@@ -74,9 +77,9 @@ export default {
url: '/pagesB/pages/move-car/scan?moveCode=' + this.checkCode.code url: '/pagesB/pages/move-car/scan?moveCode=' + this.checkCode.code
}) })
}else if(this.checkCode.selfFlag){ }else if(this.checkCode.selfFlag){
}else{ }else{
} }
} }
}) })
......
pagesA/pages/index/getPrice.vue
View file @ 3e80e835
...@@ -161,13 +161,18 @@ export default { ...@@ -161,13 +161,18 @@ export default {
/deep/.uni-input-input, /deep/.uni-input-input,
.uni-input-placeholder { .uni-input-placeholder {
text-indent: 300rpx;
text-align: right; text-align: right;
} }
.self__input__km { .self__input__km {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
span{
text-align: right;
display: inline-block;
width: 100rpx;
}
} }
.content__code { .content__code {
......
pagesB/pages/move-car/addCar.vue
View file @ 3e80e835
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<div class="add__user"> <div class="add__user">
<u-checkbox-group placement="row"> <u-checkbox-group placement="row">
<u-checkbox v-model="checked"></u-checkbox> <u-checkbox :checked='checked' @change="changeBtn" ></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
勾选同意<span>《用户服务协议》</span> 勾选同意<span>《用户服务协议》</span>
</div> </div>
...@@ -97,6 +97,9 @@ export default { ...@@ -97,6 +97,9 @@ export default {
}; };
}, },
methods: { methods: {
changeBtn(){
this.checked = !this.checked;
},
goBack() { goBack() {
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
......
pagesB/pages/move-car/loveCar.vue
View file @ 3e80e835
...@@ -48,6 +48,13 @@ export default { ...@@ -48,6 +48,13 @@ export default {
}; };
}, },
methods: { methods: {
select(item) {
this.$store.state.selectedCar=item;
//返回
uni.navigateBack({
delta: 1
});
},
addCar() { addCar() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/addCar' url: '/pagesB/pages/move-car/addCar'
...@@ -110,7 +117,7 @@ export default { ...@@ -110,7 +117,7 @@ export default {
onLoad(e) { onLoad(e) {
this.price = e.price this.price = e.price
}, },
} }
</script> </script>
......
pagesB/pages/move-car/myCall.vue
View file @ 3e80e835
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="myRecord"> <div class="myRecord">
<scroll-list ref="list" :option="option" @load="load">
<div class="record__item" v-for="(vo,inx) in items" :key="inx"> <div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
<div class="top__time"> <div class="top__time">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
</scroll-list>
</div> </div>
</view> </view>
</template> </template>
...@@ -39,16 +41,42 @@ ...@@ -39,16 +41,42 @@
export default { export default {
data() { data() {
return { return {
items: [], option: {
type: '请求他人挪车' size: 10,
auto: true
},
items: [],
type: '请求他人挪车'
}; };
}, },
methods: { methods: {
goDetail(id){ // 加载数据
uni.navigateTo({ load(paging) {
url: '/pagesB/pages/move-car/callDetail?id=' + id setTimeout(() => {
}) let list = [];
}, let opts = { url: '/app/moveLog/apply/list', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
list = res.data.rows
this.items = [...this.items, ...list]
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({
list: this.items,
total: res.data.total
});
// 加载失败
// this.$refs.list.loadFail()
}
})
}, this.$u.random(100, 1000));
},
goDetail(id){
uni.navigateTo({
url: '/pagesB/pages/move-car/callDetail?id=' + id
})
},
getApplyMoveLogList(){ getApplyMoveLogList(){
let opts = { url: '/app/moveLog/apply/list', method: 'get' }; let opts = { url: '/app/moveLog/apply/list', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
...@@ -59,7 +87,7 @@ export default { ...@@ -59,7 +87,7 @@ export default {
}, },
}, },
created() { created() {
this.getApplyMoveLogList() //this.getApplyMoveLogList()
}, },
} }
</script> </script>
......
pagesB/pages/move-car/myMoveCar.vue
View file @ 3e80e835
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search> <u-search placeholder="请输入车牌号" :showAction='false' bgColor='#ffffff' v-model="keyword"></u-search>
</div> </div>
<div class="my__list"> <div class="my__list">
<scroll-list ref="list" :option="option" @load="load">
<div class="list__item" v-for="(vo,inx) in items" :key="inx"> <div class="list__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
<div class="top__img"> <div class="top__img">
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
@confirm="unbind" @cancel="cancelModal" showCancelButton="true"></u-modal> @confirm="unbind" @cancel="cancelModal" showCancelButton="true"></u-modal>
</div> </div>
</div> </div>
</scroll-list>
</div> </div>
</div> </div>
</view> </view>
...@@ -44,20 +46,44 @@ ...@@ -44,20 +46,44 @@
export default { export default {
data() { data() {
return { return {
option: {
size: 10,
auto: true
},
keyword: '', keyword: '',
//挪车码列表 //挪车码列表
items: [], items: [],
//解除绑定对话框 //解除绑定对话框
unbindShow: false, unbindShow: false,
//解除绑定对话框标题 //解除绑定对话框标题
unbindTitle: '解除绑定', unbindTitle: '解除绑定',
//解除绑定对话框内容 //解除绑定对话框内容
unbindContent: '确定解除绑定吗？', unbindContent: '确定解除绑定吗？',
//解除绑定的挪车牌 //解除绑定的挪车牌
id: '', id: '',
}; };
}, },
methods: { methods: {
// 加载数据
load(paging) {
setTimeout(() => {
let list = [];
let opts = { url: '/app/moveCode/list', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
list = res.data.rows
this.items = [...this.items, ...list]
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({
list: this.items,
total: res.data.total
});
// 加载失败
// this.$refs.list.loadFail()
}
})
}, this.$u.random(100, 1000));
},
goView(id){ goView(id){
uni.navigateTo({ uni.navigateTo({
url: '/pagesB/pages/move-car/moveCarDetail?id=' + id url: '/pagesB/pages/move-car/moveCarDetail?id=' + id
...@@ -93,9 +119,9 @@ export default { ...@@ -93,9 +119,9 @@ export default {
}, },
}, },
created() { created() {
this.getMyMoveCodeList() //this.getMyMoveCodeList()
} }
} }
</script> </script>
...@@ -119,6 +145,7 @@ export default { ...@@ -119,6 +145,7 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-bottom: 44rpx; margin-bottom: 44rpx;
align-items: center; align-items: center;
.top__img { .top__img {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
...@@ -158,6 +185,7 @@ export default { ...@@ -158,6 +185,7 @@ export default {
.item__bottom { .item__bottom {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
span { span {
display: inline-block; display: inline-block;
width: 180rpx; width: 180rpx;
......
pagesB/pages/move-car/myRecord.vue
View file @ 3e80e835
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<template> <template>
<view class="appCotent"> <view class="appCotent">
<div class="myRecord"> <div class="myRecord">
<scroll-list ref="list" :option="option" @load="load">
<div class="record__item" v-for="(vo,inx) in items" :key="inx"> <div class="record__item" v-for="(vo,inx) in items" :key="inx">
<div class="item__top"> <div class="item__top">
<div class="top__time"> <div class="top__time">
...@@ -31,6 +32,7 @@ ...@@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
</scroll-list>
</div> </div>
</view> </view>
</template> </template>
...@@ -39,11 +41,36 @@ ...@@ -39,11 +41,36 @@
export default { export default {
data() { data() {
return { return {
option: {
size: 10,
auto: true
},
items: [], items: [],
type: '他人请求挪车', type: '他人请求挪车',
}; };
}, },
methods: { methods: {
// 加载数据
load(paging) {
setTimeout(() => {
let list = [];
let opts = { url: '/app/moveLog/my/list', method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) {
list = res.data.rows
this.items = [...this.items, ...list]
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({
list: this.items,
total: res.data.total
});
}
})
// 加载失败
// this.$refs.list.loadFail()
}, this.$u.random(100, 1000));
},
goDetail(id){ goDetail(id){
console.log(id) console.log(id)
uni.navigateTo({ uni.navigateTo({
...@@ -60,7 +87,7 @@ export default { ...@@ -60,7 +87,7 @@ export default {
}, },
}, },
created() { created() {
this.getMyMoveLogList() //this.getMyMoveLogList()
}, },
} }
</script> </script>
...@@ -137,10 +164,11 @@ export default { ...@@ -137,10 +164,11 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
padding-right: 40rpx; padding-right: 40rpx;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
color: #999999; color: #999999;
>div { >div {
width: 180rpx; width: 180rpx;
height: 56rpx; height: 56rpx;
......
pagesB/pages/move-car/scan.vue
View file @ 3e80e835
...@@ -162,6 +162,9 @@ export default { ...@@ -162,6 +162,9 @@ export default {
onLoad(option) { onLoad(option) {
this.moveCode = option.moveCode this.moveCode = option.moveCode
}, },
onShow:function(){
console.log( this.$store.state.selectedCar);
}
} }
</script> </script>
......
pagesC/pages/shop/index.vue
View file @ 3e80e835
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<div class="shop__list__one"> <div class="shop__list__one">
<div class="view__title">车主精选 养车必备</div> <div class="view__title">车主精选 养车必备</div>
<div class="list__one__items"> <div class="list__one__items">
<scroll-list ref="list" :option="option" @load="load">
<div class="one__item" v-for="(vo,inx) in boutiqueMallList" :key="inx" @click="goDetail(vo.id)"> <div class="one__item" v-for="(vo,inx) in boutiqueMallList" :key="inx" @click="goDetail(vo.id)">
<div class="one__item__img"> <div class="one__item__img">
<image :src="getImage(vo.mainImgUrl)" /> <image :src="getImage(vo.mainImgUrl)" />
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
</div> </div>
</div> </div>
</div> </div>
</scroll-list>
</div> </div>
</view> </view>
<u-gap bgColor="transparent" height="60"></u-gap> <u-gap bgColor="transparent" height="60"></u-gap>
...@@ -54,19 +56,43 @@ export default { ...@@ -54,19 +56,43 @@ export default {
}, },
data() { data() {
return { return {
option: {
size: 10,
auto: true
},
keyword: '', keyword: '',
list3: [ list3: [
'https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
'https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
], ],
//普通商品列表 //普通商品列表
mallList: [], mallList: [],
//精品商品 //精品商品
boutiqueMallList: [], boutiqueMallList: [],
} }
}, },
methods: { methods: {
// 加载数据
load(paging) {
setTimeout(() => {
let opts = { url: '/app/mall/list', method: 'get' };
this.http.httpTokenRequest(opts, {classification: "2"}).then(res => {
if (res.data.code == 200) {
let list = res.data.data.rows
this.boutiqueMallList = [...this.boutiqueMallList, ...list];
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({
list: this.boutiqueMallList,
total: res.data.data.total
});
// 加载失败
// this.$refs.list.loadFail()
}
})
}, this.$u.random(100, 1000));
},
goSearch() { goSearch() {
uni.navigateTo({ uni.navigateTo({
url: '/pagesC/pages/shop/search' url: '/pagesC/pages/shop/search'
......
pagesC/pages/shop/pay.vue
View file @ 3e80e835
...@@ -111,7 +111,7 @@ export default { ...@@ -111,7 +111,7 @@ export default {
let opts = { url: '/app/mall/create/order', method: 'post' }; let opts = { url: '/app/mall/create/order', method: 'post' };
this.http.httpTokenRequest(opts, this.createOrder).then(res => { this.http.httpTokenRequest(opts, this.createOrder).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
let orderIds = res.data.data let orderIds = res.data.data
that.orderSubmit = { that.orderSubmit = {
appId: 6, appId: 6,
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
console.log(res); console.log(res);
if (res.data.code == 200) { if (res.data.code == 200) {
let paymentData = res.data.data.invokeResponse; let paymentData = res.data.data.invokeResponse;
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', // 服务提提供商 provider: 'wxpay', // 服务提提供商
timeStamp: paymentData.timeStamp, timeStamp: paymentData.timeStamp,
...@@ -135,19 +135,19 @@ export default { ...@@ -135,19 +135,19 @@ export default {
console.log('支付成功',res); console.log('支付成功',res);
uni.navigateTo({ uni.navigateTo({
url: '/pagesC/pages/shop/payOk' url: '/pagesC/pages/shop/payOk'
}) })
}, },
fail: function (err) { fail: function (err) {
console.log('支付失败',err); console.log('支付失败',err);
}, },
}); });
} else { } else {
} }
}) })
} }
}) })
}, },
getMallInfo(){ getMallInfo(){
let opts = { url: '/app/mall/' + this.id, method: 'get' }; let opts = { url: '/app/mall/' + this.id, method: 'get' };
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
}, },
goAddress(){ goAddress(){
uni.navigateTo({ uni.navigateTo({
url: '/pagesD/pages/personal/myAddress?pay=1' url: '/pagesD/pages/personal/myAddress?pay=1'
}) })
}, },
addAddress() { addAddress() {
...@@ -221,6 +221,28 @@ export default { ...@@ -221,6 +221,28 @@ export default {
.pay { .pay {
padding-top: 40rpx; padding-top: 40rpx;
.add__address {
width: 670rpx;
height: 90rpx;
background: #ffffff;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);
border-radius: 10rpx;
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #F88D28;
display: flex;
margin: 0 auto;
align-items: center;
justify-content: center;
image {
width: 34rpx;
height: 36rpx;
margin-right: 20rpx;
}
}
.price__bottom { .price__bottom {
width: 100%; width: 100%;
height: 156rpx; height: 156rpx;
...@@ -296,7 +318,7 @@ export default { ...@@ -296,7 +318,7 @@ export default {
margin-bottom: 30rpx; margin-bottom: 30rpx;
.address__left { .address__left {
width: 600rpx; width: 600rpx;
.right__title { .right__title {
font-size: 32rpx; font-size: 32rpx;
font-family: PingFang SC; font-family: PingFang SC;
...@@ -310,9 +332,16 @@ export default { ...@@ -310,9 +332,16 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
span:nth-of-type(1) { span:nth-of-type(1) {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: bold;
color: #F88D28;
padding: 2rpx 4rpx;
border: 1rpx solid #F88D28;
}
span:nth-of-type(2) {
font-size: 28rpx; font-size: 28rpx;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: 500; font-weight: 500;
...@@ -320,20 +349,11 @@ export default { ...@@ -320,20 +349,11 @@ export default {
padding: 0 14rpx; padding: 0 14rpx;
} }
span:nth-of-type(2) { span:nth-of-type(3) {
font-size: 28rpx; font-size: 28rpx;
font-family: DIN; font-family: DIN;
font-weight: 500; font-weight: 500;
color: #666666; color: #666666;
}
span:nth-of-type(3) {
font-size: 24rpx;
font-family: PingFang SC;
font-weight: bold;
color: #F88D28;
margin-left: 20rpx;
padding: 2rpx 4rpx;
border: 1rpx solid #F88D28;
} }
} }
} }
...@@ -345,27 +365,7 @@ export default { ...@@ -345,27 +365,7 @@ export default {
} }
} }
} }
.add__address {
width: 670rpx;
height: 90rpx;
background: #ffffff;
box-shadow: 0rpx 0rpx 28rpx 1rpx rgba(232, 232, 232, 0.16);
border-radius: 10rpx;
font-size: 32rpx;
font-family: PingFang SC;
font-weight: 500;
color: #F88D28;
display: flex;
margin: 0 auto;
align-items: center;
justify-content: center;
image {
width: 34rpx;
height: 36rpx;
margin-right: 20rpx;
}
}
.pay__item { .pay__item {
padding: 30rpx 40rpx; padding: 30rpx 40rpx;
......
pagesD/pages/personal/addAddress.vue
View file @ 3e80e835
...@@ -172,6 +172,7 @@ export default { ...@@ -172,6 +172,7 @@ export default {
/deep/ .u-form-item__body__right__content__slot { /deep/ .u-form-item__body__right__content__slot {
justify-content: flex-end; justify-content: flex-end;
flex-direction: row !important;
} }
} }
......
pagesD/pages/personal/carTime.vue
View file @ 3e80e835
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<div> <div>
物流单号:{{waybillInfo.waybillNo}} 物流单号:{{waybillInfo.waybillNo}}
</div> </div>
<div class="time__btn btn__one"> <div class="time__btn btn__one" @click="copy">
<span>复制</span> <span>复制</span>
</div> </div>
</div> </div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="time__list"> <div class="time__list">
<div class="item"> <div class="item">
<div class="item__img"> <div class="item__img">
...@@ -96,6 +96,23 @@ export default { ...@@ -96,6 +96,23 @@ export default {
} }
}, },
methods: { methods: {
copy() {
wx.setClipboardData({
data: this.order,
success(res) {
wx.getClipboardData({
success(res) {
//提示
uni.showToast({
title: "已复制到剪切板",
icon: 'none',
duration: 2000,
});
}
})
}
})
}
//获得订单详情 //获得订单详情
getWaybillInfo(){ getWaybillInfo(){
let opts = { url: '/app/user/order/waybill/' + this.orderId, method: 'get' }; let opts = { url: '/app/user/order/waybill/' + this.orderId, method: 'get' };
......
pagesD/pages/personal/editAddress.vue
View file @ 3e80e835
...@@ -142,19 +142,21 @@ export default { ...@@ -142,19 +142,21 @@ export default {
onShow(){ onShow(){
this.getAddress() this.getAddress()
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.editAddress { .editAddress {
.app__gps{ .app__gps{
display: inline-block;
image{ image{
width: 34rpx; width: 34rpx;
height: 36rpx; height: 36rpx;
} }
} }
.app__right{ .app__right{
display: inline-block;
padding-left: 20rpx; padding-left: 20rpx;
padding-bottom: 10rpx; padding-bottom: 10rpx;
image{ image{
...@@ -219,6 +221,7 @@ export default { ...@@ -219,6 +221,7 @@ export default {
/deep/ .u-form-item__body__right__content__slot { /deep/ .u-form-item__body__right__content__slot {
justify-content: flex-end; justify-content: flex-end;
flex-direction: row !important;
} }
} }
......
pagesD/pages/personal/myOrder.vue
View file @ 3e80e835
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
transform: 'scale(1)' transform: 'scale(1)'
}" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"> }" itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;">
</u-tabs> </u-tabs>
<scroll-list ref="list" :option="option" @load="load">
<div class="order__content" v-for="(item,index) in orderList"> <div class="order__content" v-for="(item,index) in orderList">
<div class="order__items" @click="orderDetail(item.id)" v-if="(current===0||current===1) && item.orderStatus == 10"> <div class="order__items" @click="orderDetail(item.id)" v-if="(current===0||current===1) && item.orderStatus == 10">
<div class="item"> <div class="item">
...@@ -143,7 +144,9 @@ ...@@ -143,7 +144,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</scroll-list>
</div> </div>
</view> </view>
</template> </template>
...@@ -152,6 +155,11 @@ ...@@ -152,6 +155,11 @@
export default { export default {
data() { data() {
return { return {
list:[],
option: {
size: 10,
auto: true
},
current: 0, current: 0,
list4: [{ list4: [{
name: '全部订单' name: '全部订单'
...@@ -180,6 +188,40 @@ export default { ...@@ -180,6 +188,40 @@ export default {
}) })
}, },
methods: { methods: {
// 加载数据
load(paging) {
setTimeout(() => {
let list = [];
let order = {}
//订单状态:0-未支付,10-待发货,20-待收货,30-退款/售后,50-已完成
if(this.current == 0){
}else if(this.current == 1){
order.orderStatus = 10;
}else if(this.current == 2){
order.orderStatus = 20;
}else if(this.current == 3){
order.orderStatus = 50;
}else if(this.current == 4){
order.orderStatus = 30;
}else{
}
let opts = { url: '/app/user/order/list', method: 'get' };
this.http.httpTokenRequest(opts, order).then(res => {
if (res.data.code == 200) {
list = res.data.data.rows
this.orderList = [...this.orderList, ...list];
// 加载成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
this.$refs.list.loadSuccess({
list: this.orderList,
total: res.data.data.total
});
// 加载失败
// this.$refs.list.loadFail()
}
})
}, this.$u.random(100, 1000));
},
pull(orderId) { pull(orderId) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesD/pages/personal/pull?orderId=' + orderId url: '/pagesD/pages/personal/pull?orderId=' + orderId
...@@ -199,7 +241,7 @@ export default { ...@@ -199,7 +241,7 @@ export default {
this.showDelModal = false this.showDelModal = false
}, },
confirmDel(){ confirmDel(){
let opts = { url: '/app/user/order/remove/' + this.deleteId, method: 'get' }; let opts = { url: '/app/user/order/remove/' + this.deleteId, method: 'get' };
this.http.httpTokenRequest(opts, {}).then(res => { this.http.httpTokenRequest(opts, {}).then(res => {
if (res.data.code == 200) { if (res.data.code == 200) {
...@@ -230,7 +272,7 @@ export default { ...@@ -230,7 +272,7 @@ export default {
let order = {} let order = {}
//订单状态:0-未支付,10-待发货,20-待收货,30-退款/售后,50-已完成 //订单状态:0-未支付,10-待发货,20-待收货,30-退款/售后,50-已完成
if(this.current == 0){ if(this.current == 0){
}else if(this.current == 1){ }else if(this.current == 1){
order.orderStatus = 10; order.orderStatus = 10;
}else if(this.current == 2){ }else if(this.current == 2){
...@@ -250,13 +292,13 @@ export default { ...@@ -250,13 +292,13 @@ export default {
}, },
}, },
onShow() { onShow() {
this.getOrderList() //this.getOrderList()
}, },
onLoad(e) { onLoad(e) {
if(e.current) { if(e.current) {
this.current = parseInt(e.current) this.current = parseInt(e.current)
} }
}, },
} }
</script> </script>
......
store/index.js 0 → 100644
View file @ 3e80e835
import Vue from "vue";
import Vuex from "vuex";
Vue.use(Vuex);
const store = new Vuex.Store({
state: {
token: "",
selectedCar: {},
},
actions: {},
});
export default store;
unpackage/dist/dev/mp-weixin/common/scroll-list/scroll-list.js 0 → 100644
View file @ 3e80e835
This diff is collapsed.
unpackage/dist/dev/mp-weixin/common/scroll-list/scroll-list.json 0 → 100644
View file @ 3e80e835
{
"usingComponents": {},
"component": true
}
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/scroll-list/scroll-list.wxml 0 → 100644
View file @ 3e80e835
<view class="scroll-list-wrap data-v-3378e1d2" style="{{$root.s0}}"><scroll-view class="{{['scroll-view','data-v-3378e1d2',elClass]}}" style="{{$root.s1}}" scroll-y="{{true}}" scroll-anchoring="{{true}}" enable-back-to-top="{{true}}" scroll-top="{{scrollTop}}" lower-threshold="{{defaultOption.lowerThreshold}}" data-event-opts="{{[['scroll',[['handleScroll',['$event']]]],['touchend',[['handleTouchEnd',['$event']]]],['touchmove',[['handleTouchMove',['$event']]]],['touchstart',[['handleTouchStart',['$event']]]],['scrolltolower',[['handleScrolltolower',['$event']]]]]}}" bindscroll="__e" bindtouchend="__e" catchtouchmove="__e" bindtouchstart="__e" bindscrolltolower="__e"><view class="scroll-content data-v-3378e1d2" style="{{$root.s2}}"><view class="pull-down-wrap data-v-3378e1d2"><block wx:if="{{$slots.pulldown}}"><slot name="pulldown"></slot></block><block wx:else><view class="refresh-view data-v-3378e1d2" style="{{$root.s3}}"><view class="{{['pull-down-animation','data-v-3378e1d2',(refreshing)?'refreshing':'']}}" style="{{$root.s4}}"></view><text class="pull-down-text data-v-3378e1d2" style="{{$root.s5}}">{{refreshStateText}}</text></view></block></view><block wx:if="{{showEmpty}}"><view class="empty-wrap data-v-3378e1d2"><block wx:if="{{$slots.empty}}"><slot name="empty"></slot></block><block wx:else><view class="empty-view data-v-3378e1d2"><image class="empty-image data-v-3378e1d2" src="{{defaultOption.emptyImage||images.empty}}" mode="aspectFit"></image><text class="empty-text data-v-3378e1d2" style="{{$root.s6}}">{{emptyText}}</text></view></block></view></block><view class="list-content data-v-3378e1d2"><slot></slot></view><block wx:if="{{showPullUp}}"><view class="pull-up-wrap data-v-3378e1d2"><block wx:if="{{$slots.pullup}}"><slot name="pullup"></slot></block><block wx:else><view class="load-view data-v-3378e1d2"><block wx:if="{{loading}}"><view class="pull-up-animation data-v-3378e1d2" style="{{$root.s7}}"></view></block><text class="pull-up-text data-v-3378e1d2" style="{{$root.s8}}">{{loadStateText}}</text></view></block></view></block></view></scroll-view></view>
\ No newline at end of file
unpackage/dist/dev/mp-weixin/common/scroll-list/scroll-list.wxss 0 → 100644
View file @ 3e80e835
@charset "UTF-8";
/**
* 这里是uni-app内置的常用样式变量
*
* uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
* 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
*
*/
/**
* 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
*
* 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
*/
/* 颜色变量 */
/* 行为相关颜色 */
/* 文字基本颜色 */
/* 背景颜色 */
/* 边框颜色 */
/* 尺寸变量 */
/* 文字尺寸 */
/* 图片尺寸 */
/* Border Radius */
/* 水平间距 */
/* 垂直间距 */
/* 透明度 */
/* 文章场景相关 */
.scroll-list-wrap.data-v-3378e1d2 {
box-sizing: border-box;
}
.scroll-list-wrap .scroll-view.data-v-3378e1d2 {
position: relative;
}
.scroll-list-wrap .scroll-view .scroll-content.data-v-3378e1d2 {
height: 100%;
display: flex;
will-change: transform;
flex-direction: column;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-down-wrap.data-v-3378e1d2 {
left: 0;
width: 100%;
display: flex;
padding: 30rpx 0;
position: absolute;
align-items: flex-end;
justify-content: center;
-webkit-transform: translateY(-100%);
transform: translateY(-100%);
}
.scroll-list-wrap .scroll-view .scroll-content .pull-down-wrap .refresh-view.data-v-3378e1d2 {
display: flex;
justify-content: center;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-down-wrap .refresh-view .pull-down-animation.data-v-3378e1d2 {
width: 32rpx;
height: 32rpx;
border-width: 4rpx;
border-style: solid;
border-radius: 50%;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-down-wrap .refresh-view .pull-down-animation.refreshing.data-v-3378e1d2 {
-webkit-animation: spin-data-v-3378e1d2 0.5s linear infinite;
animation: spin-data-v-3378e1d2 0.5s linear infinite;
}
@-webkit-keyframes spin-data-v-3378e1d2 {
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
@keyframes spin-data-v-3378e1d2 {
to {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}
.scroll-list-wrap .scroll-view .scroll-content .pull-down-wrap .refresh-view .pull-down-text.data-v-3378e1d2 {
margin-left: 10rpx;
}
.scroll-list-wrap .scroll-view .scroll-content .empty-wrap.data-v-3378e1d2 {
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
position: absolute;
align-items: center;
flex-direction: column;
}
.scroll-list-wrap .scroll-view .scroll-content .empty-wrap .empty-view.data-v-3378e1d2 {
margin: auto;
display: flex;
align-items: center;
flex-direction: column;
}
.scroll-list-wrap .scroll-view .scroll-content .empty-wrap .empty-view .empty-image.data-v-3378e1d2 {
width: 200rpx;
height: 200rpx;
}
.scroll-list-wrap .scroll-view .scroll-content .empty-wrap .empty-view .empty-text.data-v-3378e1d2 {
color: #606266;
margin-top: 20rpx;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-up-wrap.data-v-3378e1d2 {
display: flex;
align-items: center;
justify-content: center;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-up-wrap .load-view.data-v-3378e1d2 {
padding: 20rpx 0;
display: flex;
align-items: center;
justify-content: center;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-up-wrap .load-view .pull-up-animation.data-v-3378e1d2 {
width: 32rpx;
height: 32rpx;
border-width: 4rpx;
border-style: solid;
border-radius: 50%;
-webkit-animation: spin-data-v-3378e1d2 0.5s linear infinite;
animation: spin-data-v-3378e1d2 0.5s linear infinite;
}
.scroll-list-wrap .scroll-view .scroll-content .pull-up-wrap .load-view .pull-up-text.data-v-3378e1d2 {
margin-left: 10rpx;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment