Merge branch 'master' of http://git.luyuan.tk/luyuan/demingshangjia into xbx
This commit is contained in:
commit
74fbd629d6
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
.vscode
|
.vscode
|
||||||
node_modules
|
node_modules
|
||||||
|
unpackage
|
14
App.vue
14
App.vue
@ -1,18 +1,18 @@
|
|||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
onLaunch: function() {
|
onLaunch: function() {
|
||||||
console.log('App Launch')
|
console.log('App Launch');
|
||||||
},
|
},
|
||||||
onShow: function() {
|
onShow: function() {
|
||||||
console.log('App Show')
|
console.log('App Show');
|
||||||
},
|
},
|
||||||
onHide: function() {
|
onHide: function() {
|
||||||
console.log('App Hide')
|
console.log('App Hide');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
/*每个页面公共css */
|
/*每个页面公共css */
|
||||||
@import "uview-ui/index.scss";
|
@import 'uview-ui/index.scss';
|
||||||
</style>
|
</style>
|
||||||
|
@ -8,7 +8,7 @@ const install = (Vue, vm) => {
|
|||||||
return vm.$u.get("Streaming/getLiveSpec")
|
return vm.$u.get("Streaming/getLiveSpec")
|
||||||
},
|
},
|
||||||
login({member_name,member_password}){
|
login({member_name,member_password}){
|
||||||
return vm.$u.post("Login/login",{member_name,member_password})
|
return vm.$u.get("/Login/expertLogin",{member_name,member_password})
|
||||||
},
|
},
|
||||||
createLivesp({spec_name}){
|
createLivesp({spec_name}){
|
||||||
return vm.$u.post("Streaming/createLivesp",{spec_name})
|
return vm.$u.post("Streaming/createLivesp",{spec_name})
|
||||||
@ -21,7 +21,19 @@ const install = (Vue, vm) => {
|
|||||||
},
|
},
|
||||||
liveStreamList(){
|
liveStreamList(){
|
||||||
return vm.$u.post("Streaming/liveStreamList")
|
return vm.$u.post("Streaming/liveStreamList")
|
||||||
}
|
},
|
||||||
|
// 获取订单列表
|
||||||
|
getorderlist(){
|
||||||
|
return vm.$u.get("/Order/orderList")
|
||||||
|
},
|
||||||
|
// 获取轮播图列表
|
||||||
|
getswiper(){
|
||||||
|
return vm.$u.get("/Order/orderList")
|
||||||
|
},
|
||||||
|
// 商家登陆
|
||||||
|
shoplogin(obj){
|
||||||
|
return vm.$u.get("/Login/storeLogin",obj)
|
||||||
|
},
|
||||||
}
|
}
|
||||||
// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
|
// 将各个定义的接口名称,统一放进对象挂载到vm.$u.api(因为vm就是this,也即this.$u.api)下
|
||||||
vm.$u.api = api;
|
vm.$u.api = api;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
const install = (Vue, vm) => {
|
const install = (Vue, vm) => {
|
||||||
// 此为自定义配置参数,具体参数见上方说明
|
// 此为自定义配置参数,具体参数见上方说明
|
||||||
Vue.prototype.$u.http.setConfig({
|
Vue.prototype.$u.http.setConfig({
|
||||||
baseUrl: 'https://dmmall.sdbairui.com//storeapi',
|
baseUrl: 'https://dmmall.sdbairui.com/storeapi',
|
||||||
loadingText: '努力加载中~',
|
loadingText: '努力加载中~',
|
||||||
loadingTime: 800,
|
loadingTime: 800,
|
||||||
originalData: true,
|
originalData: true,
|
||||||
|
5
package-lock.json
generated
5
package-lock.json
generated
@ -6,13 +6,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"uview-ui": {
|
"uview-ui": {
|
||||||
"version": "1.5.2",
|
"version": "1.5.2",
|
||||||
<<<<<<< HEAD
|
|
||||||
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
|
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
|
||||||
"integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
|
"integrity": "sha512-FV9G+gZTAZKEE2m85ahIbIRiC/fdzTl+eNXDIMBoyc9b+fQWQhEtmAfu6huu7AtKuTI6gfqaYn6WGcmqYvr76w=="
|
||||||
=======
|
|
||||||
"resolved": "https://registry.npm.taobao.org/uview-ui/download/uview-ui-1.5.2.tgz?cache=0&sync_timestamp=1594781920423&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuview-ui%2Fdownload%2Fuview-ui-1.5.2.tgz",
|
|
||||||
"integrity": "sha1-4jDud0TIBjMJe74GU+IyvJSyAwk="
|
|
||||||
>>>>>>> fa383397b331ec0091096becf886f978cc1277fc
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,31 +1,35 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="home">
|
<view class="home">
|
||||||
<view class="image-swiper">
|
<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
|
||||||
<u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper>
|
|
||||||
</view>
|
|
||||||
<view class="tab-swiper">
|
<view class="tab-swiper">
|
||||||
<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" active-color="#FF780F" inactive-color="#333333" font-size="26" height="98" :show-bar="false" swiperWidth="750" gutter="52"></u-tabs-swiper>
|
<u-tabs-swiper
|
||||||
|
ref="uTabs"
|
||||||
|
:list="list"
|
||||||
|
:current="current"
|
||||||
|
@change="tabsChange"
|
||||||
|
active-color="#FF780F"
|
||||||
|
inactive-color="#333333"
|
||||||
|
font-size="26"
|
||||||
|
height="98"
|
||||||
|
:show-bar="false"
|
||||||
|
swiperWidth="750"
|
||||||
|
gutter="52"
|
||||||
|
></u-tabs-swiper>
|
||||||
</view>
|
</view>
|
||||||
<swiper :current="swiperCurrent" @animationfinish="animationfinish">
|
<swiper :current="swiperCurrent" @animationfinish="animationfinish">
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
|
<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
|
||||||
<view v-for="(item, index) in 5" :key="index">
|
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
|
||||||
<OrderItem :cur="current"></OrderItem>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||||
<view v-for="(item, index) in 5" :key="index">
|
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
|
||||||
<OrderItem :cur="current"></OrderItem>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||||
<view v-for="(item, index) in 5" :key="index">
|
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
|
||||||
<OrderItem :cur="current"></OrderItem>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
@ -34,10 +38,10 @@
|
|||||||
<view class="select-container">
|
<view class="select-container">
|
||||||
<view class="title">选择骑手</view>
|
<view class="title">选择骑手</view>
|
||||||
<view class="worker" v-if="JSON.stringify(worker) != '{}'">
|
<view class="worker" v-if="JSON.stringify(worker) != '{}'">
|
||||||
<view>{{ worker.company + " " + worker.name }}</view>
|
<view>{{ worker.company + ' ' + worker.name }}</view>
|
||||||
<u-icon name="edit-pen" @click="worker={}"></u-icon>
|
<u-icon name="edit-pen" @click="worker = {}"></u-icon>
|
||||||
</view>
|
</view>
|
||||||
<view v-else class="select" @click="showSelect=true">
|
<view v-else class="select" @click="showSelect = true">
|
||||||
<view>请选择</view>
|
<view>请选择</view>
|
||||||
<image src="/static/image/home/5.png"></image>
|
<image src="/static/image/home/5.png"></image>
|
||||||
</view>
|
</view>
|
||||||
@ -47,28 +51,24 @@
|
|||||||
<textarea placeholder-style="color:#999999" placeholder="请输入内容" />
|
<textarea placeholder-style="color:#999999" placeholder="请输入内容" />
|
||||||
</view>
|
</view>
|
||||||
<!-- 事件 -->
|
<!-- 事件 -->
|
||||||
<view class="btn" @click="showComplaint=true">确定</view>
|
<view class="btn" @click="showComplaint = true">确定</view>
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||||
<view v-for="(item, index) in 5" :key="index">
|
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
|
||||||
<OrderItem :cur="current"></OrderItem>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
<swiper-item class="swiper-item">
|
<swiper-item class="swiper-item">
|
||||||
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
<scroll-view scroll-y style="height: 100%;width: 100%;">
|
||||||
<view v-for="(item, index) in 15" :key="index">
|
<view v-for="(item, index) in 15" :key="index"><OrderItem :cur="current"></OrderItem></view>
|
||||||
<OrderItem :cur="current"></OrderItem>
|
|
||||||
</view>
|
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</swiper>
|
</swiper>
|
||||||
<view class="release-btn" @click="publish">
|
<view class="release-btn" @click="publish">
|
||||||
<image src="/static/home/1.png"></image>
|
<image src="../../static/image/index/publish.png"></image>
|
||||||
<view class="text" @click="release()">发布</view>
|
<view class="text">发布</view>
|
||||||
</view>
|
</view>
|
||||||
<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
|
<u-select v-model="showSelect" mode="mutil-column-auto" :list="workerList" @confirm="setWorker"></u-select>
|
||||||
<u-popup v-model="showComplaint" mode="center" border-radius="10">
|
<u-popup v-model="showComplaint" mode="center" border-radius="10">
|
||||||
@ -84,45 +84,50 @@
|
|||||||
<view class="publish">
|
<view class="publish">
|
||||||
<view class="list">
|
<view class="list">
|
||||||
<view @click="navto('release/tosign')">
|
<view @click="navto('release/tosign')">
|
||||||
<image></image>
|
<image src="../../static/image/index/live.png"></image>
|
||||||
<text>直播</text>
|
<text>直播</text>
|
||||||
</view>
|
</view>
|
||||||
<view @click="navto('release/index')">
|
<view @click="navto('release/index')">
|
||||||
<image></image>
|
<image src="../../static/image/index/photo.png"></image>
|
||||||
<text>图文</text>
|
<text>图文</text>
|
||||||
</view>
|
</view>
|
||||||
<view @click="navto('release/video')">
|
<view @click="navto('release/video')">
|
||||||
<image></image>
|
<image src="../../static/image/index/video.png"></image>
|
||||||
<text>视频</text>
|
<text>视频</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<image class="off"></image>
|
<image src="../../static/image/index/close.png" class="off" @click="close"></image>
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import OrderItem from '@/components/order-item/index'
|
import OrderItem from '@/components/order-item/index';
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
list: [{
|
list: [
|
||||||
|
{
|
||||||
name: '全部订单'
|
name: '全部订单'
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
name: '试穿订单'
|
name: '试穿订单'
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
name: '待处理订单'
|
name: '待处理订单'
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
name: '投诉骑手'
|
name: '投诉骑手'
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
name: '已完成订单'
|
name: '已完成订单'
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
name: '退货订单'
|
name: '退货订单'
|
||||||
}],
|
}
|
||||||
imageList: [
|
|
||||||
{}, {}, {}
|
|
||||||
],
|
],
|
||||||
|
imageList: [],
|
||||||
showSelect: false,
|
showSelect: false,
|
||||||
current: 0,
|
current: 0,
|
||||||
swiperCurrent: 0,
|
swiperCurrent: 0,
|
||||||
@ -157,28 +162,75 @@ export default {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
publishstate:true
|
publishstate: false,
|
||||||
}
|
num: 0
|
||||||
|
};
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
OrderItem
|
OrderItem
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
|
this.getswiper();
|
||||||
|
this.getallorder();
|
||||||
|
this.getorderlist();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
release(){
|
// 关闭发布弹窗
|
||||||
this.publishstate = true
|
close() {
|
||||||
|
this.publishstate = false;
|
||||||
},
|
},
|
||||||
publish(){
|
// 获取订单列表
|
||||||
|
getorderlist(type) {
|
||||||
|
let that = this;
|
||||||
|
this.$u.api
|
||||||
|
.getorderlist({
|
||||||
|
page: that.num,
|
||||||
|
state_type: type
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
console.log(res);
|
||||||
|
if (res.errCode != 0) {
|
||||||
|
} else {
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 获取全部订单
|
||||||
|
getallorder() {
|
||||||
|
let that = this;
|
||||||
|
this.$u.api
|
||||||
|
.getorderlist({
|
||||||
|
page: that.num
|
||||||
|
})
|
||||||
|
.then(res => {
|
||||||
|
console.log(res);
|
||||||
|
if (res.errCode != 0) {
|
||||||
|
} else {
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
// 获取轮播图
|
||||||
|
getswiper() {
|
||||||
|
this.imageList =[{
|
||||||
|
image: '../../static/image/index/swiper.png'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
image: '../../static/image/index/swiper.png'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
image: '../../static/image/index/swiper.png'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
// 打开发布弹窗
|
||||||
|
publish() {
|
||||||
|
this.publishstate = true;
|
||||||
},
|
},
|
||||||
setWorker(e) {
|
setWorker(e) {
|
||||||
// console.log(e);
|
// console.log(e);
|
||||||
this.worker = {
|
this.worker = {
|
||||||
company: e[0].label,
|
company: e[0].label,
|
||||||
name: e[1].label
|
name: e[1].label
|
||||||
}
|
};
|
||||||
},
|
},
|
||||||
tabsChange(index) {
|
tabsChange(index) {
|
||||||
this.swiperCurrent = index;
|
this.swiperCurrent = index;
|
||||||
@ -189,22 +241,22 @@ export default {
|
|||||||
this.swiperCurrent = current;
|
this.swiperCurrent = current;
|
||||||
this.current = current;
|
this.current = current;
|
||||||
},
|
},
|
||||||
navto(url){
|
navto(url) {
|
||||||
this.$u.route({
|
this.$u.route({
|
||||||
url:`/pages/${url}`
|
url: `/pages/${url}`
|
||||||
})
|
});
|
||||||
// console.log(`/pages/${url}`)
|
// console.log(`/pages/${url}`)
|
||||||
// uni.navigateTo({
|
// uni.navigateTo({
|
||||||
// url: `/pages/${url}`
|
// url: `/pages/${url}`
|
||||||
// });
|
// });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.home {
|
.home {
|
||||||
min-height: calc(100vh - var(--window-top));
|
min-height: calc(100vh - var(--window-top));
|
||||||
background-color: #ECECEC;
|
background-color: #ececec;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
// padding-bottom: 100rpx;
|
// padding-bottom: 100rpx;
|
||||||
@ -229,14 +281,14 @@ export default {
|
|||||||
margin-bottom: 60rpx;
|
margin-bottom: 60rpx;
|
||||||
.title {
|
.title {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: rgba(51,51,51,1);
|
color: rgba(51, 51, 51, 1);
|
||||||
margin-right: 20rpx;
|
margin-right: 20rpx;
|
||||||
}
|
}
|
||||||
.select {
|
.select {
|
||||||
padding: 18rpx 20rpx;
|
padding: 18rpx 20rpx;
|
||||||
width: 490rpx;
|
width: 490rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
background: rgba(236,236,236,1);
|
background: rgba(236, 236, 236, 1);
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -255,7 +307,7 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
> view {
|
> view {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: rgba(51,51,51,1);
|
color: rgba(51, 51, 51, 1);
|
||||||
margin-right: 20rpx;
|
margin-right: 20rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -265,7 +317,7 @@ export default {
|
|||||||
display: flex;
|
display: flex;
|
||||||
.title {
|
.title {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
color: rgba(51,51,51,1);
|
color: rgba(51, 51, 51, 1);
|
||||||
margin-right: 20rpx;
|
margin-right: 20rpx;
|
||||||
}
|
}
|
||||||
> textarea {
|
> textarea {
|
||||||
@ -280,10 +332,10 @@ export default {
|
|||||||
margin: 90rpx auto 0;
|
margin: 90rpx auto 0;
|
||||||
width: 630rpx;
|
width: 630rpx;
|
||||||
height: 88rpx;
|
height: 88rpx;
|
||||||
background: rgba(255,120,15,1);
|
background: rgba(255, 120, 15, 1);
|
||||||
border-radius: 44rpx;
|
border-radius: 44rpx;
|
||||||
font-size: 36rpx;
|
font-size: 36rpx;
|
||||||
color: rgba(255,255,255,1);
|
color: rgba(255, 255, 255, 1);
|
||||||
line-height: 88rpx;
|
line-height: 88rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
@ -295,8 +347,8 @@ export default {
|
|||||||
right: 30rpx;
|
right: 30rpx;
|
||||||
width: 100rpx;
|
width: 100rpx;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
background: rgba(255,120,15,1);
|
background: rgba(255, 120, 15, 1);
|
||||||
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255,120,15,0.22);
|
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255, 120, 15, 0.22);
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@ -310,7 +362,7 @@ export default {
|
|||||||
}
|
}
|
||||||
.text {
|
.text {
|
||||||
font-size: 20rpx;
|
font-size: 20rpx;
|
||||||
color: rgba(255,255,255,1);
|
color: rgba(255, 255, 255, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.confirm-complaint {
|
.confirm-complaint {
|
||||||
@ -321,7 +373,7 @@ export default {
|
|||||||
width: 420rpx;
|
width: 420rpx;
|
||||||
padding: 55rpx 112rpx;
|
padding: 55rpx 112rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: rgba(51,51,51,1);
|
color: rgba(51, 51, 51, 1);
|
||||||
line-height: 4r2px;
|
line-height: 4r2px;
|
||||||
> view:first-child {
|
> view:first-child {
|
||||||
margin-bottom: 20rpx;
|
margin-bottom: 20rpx;
|
||||||
@ -330,38 +382,37 @@ export default {
|
|||||||
.btn {
|
.btn {
|
||||||
width: 200rpx;
|
width: 200rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
background: rgba(255,120,15,1);
|
background: rgba(255, 120, 15, 1);
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 60rpx;
|
line-height: 60rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: rgba(255,255,255,1);
|
color: rgba(255, 255, 255, 1);
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.publish{
|
.publish {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 50rpx 84rpx 31rpx 78rpx;
|
padding: 50rpx 84rpx 31rpx 78rpx;
|
||||||
image{
|
image {
|
||||||
background-color: #0f0;
|
|
||||||
}
|
}
|
||||||
.list{
|
.list {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
>view{
|
> view {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
>image{
|
> image {
|
||||||
width: 94rpx;
|
width: 94rpx;
|
||||||
height: 80rpx;
|
height: 80rpx;
|
||||||
}
|
}
|
||||||
>text{
|
> text {
|
||||||
margin-top: 10rpx;
|
margin-top: 10rpx;
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: #333;
|
color: #333;
|
||||||
@ -369,7 +420,7 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.off{
|
.off {
|
||||||
margin-top: 81rpx;
|
margin-top: 81rpx;
|
||||||
width: 37rpx;
|
width: 37rpx;
|
||||||
height: 37rpx;
|
height: 37rpx;
|
||||||
|
@ -2,43 +2,73 @@
|
|||||||
<!-- login页面 -->
|
<!-- login页面 -->
|
||||||
<view>
|
<view>
|
||||||
<view class="login">
|
<view class="login">
|
||||||
<image class="images" src=""></image>
|
<image class="images" :src="url"></image>
|
||||||
<view class="backes"></view>
|
<view class="backes"></view>
|
||||||
<view class="content">
|
|
||||||
<view class="title_top">德铭阳光在线-商家端</view>
|
<view class="title_top">德铭阳光在线-商家端</view>
|
||||||
<view class="title">账号登录</view>
|
<view class="content">
|
||||||
|
<view class="title">
|
||||||
|
<view v-bind:class="[state==0 ? 'show' : '']" @click="changetab(0)">
|
||||||
|
商家登录
|
||||||
|
</view>
|
||||||
|
<view v-bind:class="[state==1 ? 'show' : '']" @click="changetab(1)">
|
||||||
|
达人登录
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="" v-if="state==0">
|
||||||
<view class="labales">
|
<view class="labales">
|
||||||
<image src=""></image>
|
<image src="../../static/image/login/login(3).png"></image>
|
||||||
<input v-model="zhanghao" type="tel" placeholder="请输入账号" />
|
<input v-model="zhanghao" type="text" placeholder="请输入账号" />
|
||||||
</view>
|
</view>
|
||||||
<view class="labales">
|
<view class="labales">
|
||||||
<image src=""></image>
|
<image src="../../static/image/login/login(1).png"></image>
|
||||||
<input v-model="mima" type="password" placeholder="请输入密码" />
|
<input v-model="mima" type="password" placeholder="请输入密码" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="" v-else>
|
||||||
|
<view class="labales">
|
||||||
|
<image src="../../static/image/login/login(3).png"></image>
|
||||||
|
<input v-model="zhanghaoA" type="text" placeholder="请输入账号" />
|
||||||
|
</view>
|
||||||
|
<view class="labales">
|
||||||
|
<image src="../../static/image/login/login(1).png"></image>
|
||||||
|
<input v-model="mimaA" type="password" placeholder="请输入密码" />
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
</view>
|
||||||
<!-- denglu QQ weixin -->
|
<!-- denglu QQ weixin -->
|
||||||
<u-button @click="logins">{{login}}</u-button>
|
<button @click="logins">{{ login }}</button>
|
||||||
|
<!-- <u-button :custom-style="customStyle" ></u-button> -->
|
||||||
<u-toast ref="uToast" />
|
<u-toast ref="uToast" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
list: [{
|
list: [
|
||||||
|
{
|
||||||
checked: false,
|
checked: false,
|
||||||
disabled: false
|
disabled: false
|
||||||
}],
|
}
|
||||||
|
],
|
||||||
value: '',
|
value: '',
|
||||||
login: '登录',
|
login: '登录',
|
||||||
show: false,
|
show: false,
|
||||||
zhanghao:"",
|
zhanghao: 'seller',
|
||||||
mima:""
|
mima: '123456',
|
||||||
|
zhanghaoA: '18953829598 ',
|
||||||
|
mimaA: '123456',
|
||||||
|
url: '',
|
||||||
|
state:0
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 改变登陆类型
|
||||||
|
changetab(num){
|
||||||
|
this.state = num
|
||||||
|
},
|
||||||
// 选中某个复选框时,由checkbox时触发
|
// 选中某个复选框时,由checkbox时触发
|
||||||
checkboxChange(e) {
|
checkboxChange(e) {
|
||||||
//console.log(e);
|
//console.log(e);
|
||||||
@ -47,56 +77,73 @@
|
|||||||
checkboxGroupChange(e) {
|
checkboxGroupChange(e) {
|
||||||
// console.log(e);
|
// console.log(e);
|
||||||
},
|
},
|
||||||
mask_u(){
|
mask_u() {
|
||||||
this.show = !this.show
|
this.show = !this.show;
|
||||||
},
|
},
|
||||||
// 获取验证码倒计时
|
// 获取验证码倒计时
|
||||||
getCode(){
|
getCode() {
|
||||||
console.log("11")
|
console.log('11');
|
||||||
this.loading()
|
this.loading();
|
||||||
},
|
},
|
||||||
loading(){
|
loading() {},
|
||||||
|
logins() {
|
||||||
},
|
// 清除本地存储才可以正常登陆(具体原因没有仔细检查)
|
||||||
logins(){
|
uni.clearStorage();
|
||||||
this.$u.api.login({member_name:this.zhanghao,member_password:this.mima}).then((res)=>{
|
// 账号登录1达人0商家
|
||||||
console.log(res)
|
if(this.state==1){
|
||||||
if(res.errCode != 0){
|
this.$u.api.login({ member_name: this.zhanghaoA, member_password: this.mimaA }).then(res => {
|
||||||
|
console.log(res);
|
||||||
|
if (res.errCode != 0) {
|
||||||
this.$refs.uToast.show({
|
this.$refs.uToast.show({
|
||||||
title: res.message,
|
title: res.message,
|
||||||
type: 'error'
|
type: 'error'
|
||||||
})
|
});
|
||||||
}else{
|
} else {
|
||||||
uni.setStorageSync("token",res.data.token)
|
uni.setStorageSync('token', res.data.token);
|
||||||
uni.setStorageSync("userinfo",res.data)
|
uni.setStorageSync('userinfo', res.data);
|
||||||
uni.setStorageSync('rongyun',res.data.rongcloud_token)
|
uni.setStorageSync('rongyun', res.data.rongcloud_token);
|
||||||
this.$u.route({
|
this.$u.route({
|
||||||
url:"/pages/index/index",
|
url: '/pages/index/index',
|
||||||
type:"switchTab"
|
type: 'switchTab'
|
||||||
})
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
this.$u.api.shoplogin({ member_name: this.zhanghao, member_password: this.mima }).then(res => {
|
||||||
|
console.log(res);
|
||||||
|
if (res.errCode != 0) {
|
||||||
|
this.$refs.uToast.show({
|
||||||
|
title: res.message,
|
||||||
|
type: 'error'
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
uni.setStorageSync('token', res.data.token);
|
||||||
|
uni.setStorageSync('userinfo', res.data);
|
||||||
|
uni.setStorageSync('rongyun', res.data.rongcloud_token);
|
||||||
|
this.$u.route({
|
||||||
|
url: '/pages/index/index',
|
||||||
|
type: 'switchTab'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
}).catch((res)=>{
|
|
||||||
console.log(res)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(){
|
onLoad() {
|
||||||
let token = uni.getStorageSync('token');
|
let token = uni.getStorageSync('token');
|
||||||
|
|
||||||
if(token != undefined && token){
|
if (token != undefined && token) {
|
||||||
this.$u.route({
|
this.$u.route({
|
||||||
url:"/pages/index/index"
|
url: '/pages/index/index'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
.login {
|
||||||
.login {
|
|
||||||
|
|
||||||
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
|
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
|
||||||
.images {
|
.images {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
@ -113,7 +160,6 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
z-index: -1;
|
z-index: -1;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
text {
|
text {
|
||||||
@ -141,17 +187,28 @@
|
|||||||
.more_Login .other {
|
.more_Login .other {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 36rpx;
|
font-size: 36rpx;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
margin-bottom: 150rpx;
|
margin-bottom: 150rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
letter-spacing: 3rpx;
|
display: flex;
|
||||||
}
|
justify-content: flex-start;
|
||||||
|
}
|
||||||
|
.title view{
|
||||||
|
height: 100rpx;
|
||||||
|
line-height: 100rpx;
|
||||||
|
font-size: 24rpx;
|
||||||
|
padding: 0 20rpx;
|
||||||
|
}
|
||||||
|
.title .show{
|
||||||
|
font-size: 34rpx;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
width: 630rpx;
|
width: 630rpx;
|
||||||
z-index: 99999;
|
z-index: 99999;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
@ -167,7 +224,7 @@
|
|||||||
height: 70rpx;
|
height: 70rpx;
|
||||||
line-height: 70rpx;
|
line-height: 70rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
input{
|
input {
|
||||||
width: 80%;
|
width: 80%;
|
||||||
margin-left: 60rpx;
|
margin-left: 60rpx;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
@ -175,7 +232,7 @@
|
|||||||
background-color: none;
|
background-color: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.labales image{
|
.labales image {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
@ -199,50 +256,51 @@
|
|||||||
color: rgba(255, 120, 15, 1);
|
color: rgba(255, 120, 15, 1);
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.uni-input-input, .uni-input-placeholder{
|
.uni-input-input,
|
||||||
color:#fff!important;
|
.uni-input-placeholder {
|
||||||
|
color: #fff !important;
|
||||||
letter-spacing: 2rpx;
|
letter-spacing: 2rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pact text {
|
.pact text {
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: rgba(255, 255, 255, 1);
|
color: rgba(255, 255, 255, 1);
|
||||||
line-height: 36px;
|
line-height: 36px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.pact_text {
|
.pact_text {
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: rgba(129, 188, 253, 1) !important;
|
color: rgba(129, 188, 253, 1) !important;
|
||||||
line-height: 36px;
|
line-height: 36px;
|
||||||
}
|
}
|
||||||
|
|
||||||
//单选框的样式
|
//单选框的样式
|
||||||
.pact {
|
.pact {
|
||||||
position: relative;
|
position: relative;
|
||||||
padding-left: 40rpx;
|
padding-left: 40rpx;
|
||||||
overflow:hidden; //超出的文本隐藏
|
overflow: hidden; //超出的文本隐藏
|
||||||
text-overflow:ellipsis; //溢出用省略号显示
|
text-overflow: ellipsis; //溢出用省略号显示
|
||||||
white-space:nowrap; //溢出不换行
|
white-space: nowrap; //溢出不换行
|
||||||
}
|
}
|
||||||
|
|
||||||
.u-checkbox-group {
|
.u-checkbox-group {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
left: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.u-checkbox__icon--square {
|
.u-checkbox__icon--square {
|
||||||
border-radius: 50rpx !important;
|
border-radius: 50rpx !important;
|
||||||
width: 22rpx;
|
width: 22rpx;
|
||||||
height: 22rpx;
|
height: 22rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.u-btn {
|
.u-btn {
|
||||||
width: 628rpx;
|
width: 628rpx;
|
||||||
height: 98rpx;
|
height: 98rpx;
|
||||||
background: rgba(255, 120, 15, 1) !important;
|
background: rgba(255, 120, 15, 1) !important;
|
||||||
@ -254,16 +312,16 @@
|
|||||||
border: 1px #ff780f solid;
|
border: 1px #ff780f solid;
|
||||||
outline: none;
|
outline: none;
|
||||||
border-color: rgba(255, 120, 15, 1) !important;
|
border-color: rgba(255, 120, 15, 1) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.warp {
|
.warp {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rect {
|
.rect {
|
||||||
width: 558rpx;
|
width: 558rpx;
|
||||||
height: 300rpx;
|
height: 300rpx;
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
@ -272,26 +330,25 @@
|
|||||||
zoom: 1;
|
zoom: 1;
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap:wrap;
|
flex-wrap: wrap;
|
||||||
display: -webkit-flex; /* Safari */
|
display: -webkit-flex; /* Safari */
|
||||||
.rect_view{
|
.rect_view {
|
||||||
width: 100rpx;
|
width: 100rpx;
|
||||||
height: 100rpx;
|
height: 100rpx;
|
||||||
.image{
|
.image {
|
||||||
width: 45rpx;
|
width: 45rpx;
|
||||||
height: 53rpx;
|
height: 53rpx;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
||||||
}
|
}
|
||||||
flex:1;
|
flex: 1;
|
||||||
margin-top: 77rpx;
|
margin-top: 77rpx;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(2) image{
|
.rect_view:nth-child(2) image {
|
||||||
width: 57rpx;
|
width: 57rpx;
|
||||||
height: 45rpx;
|
height: 45rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rect_butoon{
|
.rect_butoon {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
@ -300,50 +357,51 @@
|
|||||||
line-height: 85rpx;
|
line-height: 85rpx;
|
||||||
border-top: 1px #999999 solid;
|
border-top: 1px #999999 solid;
|
||||||
}
|
}
|
||||||
view{
|
view {
|
||||||
color: #666;
|
color: #666;
|
||||||
font-size:24rpx;
|
font-size: 24rpx;
|
||||||
margin-top: 30rpx;
|
margin-top: 30rpx;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(1) image,.rect_view:nth-child(1) view{
|
.rect_view:nth-child(1) image,
|
||||||
|
.rect_view:nth-child(1) view {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(1) image{
|
.rect_view:nth-child(1) image {
|
||||||
margin-right: 20rpx;
|
margin-right: 20rpx;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(1){
|
.rect_view:nth-child(1) {
|
||||||
position: relative;
|
position: relative;
|
||||||
margin-right: 79rpx;
|
margin-right: 79rpx;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(1) view{
|
.rect_view:nth-child(1) view {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(2) image,.rect_view:nth-child(2) view{
|
.rect_view:nth-child(2) image,
|
||||||
|
.rect_view:nth-child(2) view {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(2) image{
|
.rect_view:nth-child(2) image {
|
||||||
margin-left: 20rpx;
|
margin-left: 20rpx;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(2){
|
.rect_view:nth-child(2) {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
.rect_view:nth-child(2) view{
|
.rect_view:nth-child(2) view {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
.title_top {
|
.title_top {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 36rpx;
|
top: calc(var(--status-bar-height) + 18px);
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
margin: auto;
|
margin: auto;
|
||||||
font-size:36rpx;
|
font-size: 36rpx;
|
||||||
color:rgba(255,255,255,1);
|
color: rgba(255, 255, 255, 1);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
/* 如果您想让slot内容占满整个导航栏的宽度 */
|
/* 如果您想让slot内容占满整个导航栏的宽度 */
|
||||||
@ -352,5 +410,17 @@
|
|||||||
/* padding: 0 30rpx; */
|
/* padding: 0 30rpx; */
|
||||||
background: none;
|
background: none;
|
||||||
letter-spacing: 4rpx;
|
letter-spacing: 4rpx;
|
||||||
}
|
}
|
||||||
|
button{
|
||||||
|
width: 670rpx;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 50rpx;
|
||||||
|
height: 100rpx;
|
||||||
|
padding: 0 40rpx;
|
||||||
|
background-color: #ff780f;
|
||||||
|
color: #FFFFFF;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
BIN
static/image/index/close.png
Normal file
BIN
static/image/index/close.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 753 B |
BIN
static/image/index/live.png
Normal file
BIN
static/image/index/live.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
BIN
static/image/index/photo.png
Normal file
BIN
static/image/index/photo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.3 KiB |
BIN
static/image/index/publish.png
Normal file
BIN
static/image/index/publish.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 234 B |
BIN
static/image/index/swiper.png
Normal file
BIN
static/image/index/swiper.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 280 KiB |
BIN
static/image/index/video.png
Normal file
BIN
static/image/index/video.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.5 KiB |
Loading…
x
Reference in New Issue
Block a user