Merge pull request 'cmx' (#12) from cmx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/12
This commit is contained in:
cmx 2020-07-29 15:26:56 +08:00
commit e71a43eb85
13 changed files with 525 additions and 394 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
.vscode
node_modules
unpackage

14
App.vue
View File

@ -1,18 +1,18 @@
<script>
export default {
export default {
onLaunch: function() {
console.log('App Launch')
console.log('App Launch');
},
onShow: function() {
console.log('App Show')
console.log('App Show');
},
onHide: function() {
console.log('App Hide')
}
console.log('App Hide');
}
};
</script>
<style lang="scss">
/*每个页面公共css */
@import "uview-ui/index.scss";
/*每个页面公共css */
@import 'uview-ui/index.scss';
</style>

View File

@ -8,7 +8,7 @@ const install = (Vue, vm) => {
return vm.$u.get("Streaming/getLiveSpec")
},
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}){
return vm.$u.post("Streaming/createLivesp",{spec_name})
@ -21,7 +21,19 @@ const install = (Vue, vm) => {
},
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 = api;

View File

@ -1,7 +1,7 @@
const install = (Vue, vm) => {
// 此为自定义配置参数,具体参数见上方说明
Vue.prototype.$u.http.setConfig({
baseUrl: 'https://dmmall.sdbairui.com//storeapi',
baseUrl: 'https://dmmall.sdbairui.com/storeapi',
loadingText: '努力加载中~',
loadingTime: 800,
// 设置自定义头部content-type

5
package-lock.json generated
View File

@ -6,13 +6,8 @@
"dependencies": {
"uview-ui": {
"version": "1.5.2",
<<<<<<< HEAD
"resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.2.tgz",
"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
}
}
}

View File

@ -1,31 +1,35 @@
<template>
<view class="home">
<view class="image-swiper">
<u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper>
</view>
<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
<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>
<swiper :current="swiperCurrent" @animationfinish="animationfinish">
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;" class="order-list">
<view v-for="(item, index) in 5" :key="index">
<OrderItem :cur="current"></OrderItem>
</view>
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index">
<OrderItem :cur="current"></OrderItem>
</view>
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index">
<OrderItem :cur="current"></OrderItem>
</view>
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
@ -34,10 +38,10 @@
<view class="select-container">
<view class="title">选择骑手</view>
<view class="worker" v-if="JSON.stringify(worker) != '{}'">
<view>{{ worker.company + " " + worker.name }}</view>
<u-icon name="edit-pen" @click="worker={}"></u-icon>
<view>{{ worker.company + ' ' + worker.name }}</view>
<u-icon name="edit-pen" @click="worker = {}"></u-icon>
</view>
<view v-else class="select" @click="showSelect=true">
<view v-else class="select" @click="showSelect = true">
<view>请选择</view>
<image src="/static/image/home/5.png"></image>
</view>
@ -47,28 +51,24 @@
<textarea placeholder-style="color:#999999" placeholder="请输入内容" />
</view>
<!-- 事件 -->
<view class="btn" @click="showComplaint=true">确定</view>
<view class="btn" @click="showComplaint = true">确定</view>
</view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 5" :key="index">
<OrderItem :cur="current"></OrderItem>
</view>
<view v-for="(item, index) in 5" :key="index"><OrderItem :cur="current"></OrderItem></view>
</scroll-view>
</swiper-item>
<swiper-item class="swiper-item">
<scroll-view scroll-y style="height: 100%;width: 100%;">
<view v-for="(item, index) in 15" :key="index">
<OrderItem :cur="current"></OrderItem>
</view>
<view v-for="(item, index) in 15" :key="index"><OrderItem :cur="current"></OrderItem></view>
</scroll-view>
</swiper-item>
</swiper>
<view class="release-btn" @click="publish">
<image src="/static/home/1.png"></image>
<view class="text" @click="release()">发布</view>
<image src="../../static/image/index/publish.png"></image>
<view class="text">发布</view>
</view>
<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">
@ -84,45 +84,50 @@
<view class="publish">
<view class="list">
<view @click="navto('release/tosign')">
<image></image>
<image src="../../static/image/index/live.png"></image>
<text>直播</text>
</view>
<view @click="navto('release/index')">
<image></image>
<image src="../../static/image/index/photo.png"></image>
<text>图文</text>
</view>
<view @click="navto('release/video')">
<image></image>
<image src="../../static/image/index/video.png"></image>
<text>视频</text>
</view>
</view>
<image class="off"></image>
<image src="../../static/image/index/close.png" class="off" @click="close"></image>
</view>
</u-popup>
</view>
</template>
<script>
import OrderItem from '@/components/order-item/index'
import OrderItem from '@/components/order-item/index';
export default {
data() {
return {
list: [{
list: [
{
name: '全部订单'
}, {
},
{
name: '试穿订单'
}, {
},
{
name: '待处理订单'
}, {
},
{
name: '投诉骑手'
}, {
},
{
name: '已完成订单'
}, {
},
{
name: '退货订单'
}],
imageList: [
{}, {}, {}
}
],
imageList: [],
showSelect: false,
current: 0,
swiperCurrent: 0,
@ -157,28 +162,75 @@ export default {
]
}
],
publishstate:true
}
publishstate: false,
num: 0
};
},
components: {
OrderItem
},
onLoad() {
this.getswiper();
this.getallorder();
this.getorderlist();
},
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) {
// console.log(e);
this.worker = {
company: e[0].label,
name: e[1].label
}
};
},
tabsChange(index) {
this.swiperCurrent = index;
@ -189,22 +241,22 @@ export default {
this.swiperCurrent = current;
this.current = current;
},
navto(url){
navto(url) {
this.$u.route({
url:`/pages/${url}`
})
url: `/pages/${url}`
});
// console.log(`/pages/${url}`)
// uni.navigateTo({
// url: `/pages/${url}`
// });
}
}
}
};
</script>
<style lang="scss" scoped>
.home {
min-height: calc(100vh - var(--window-top));
background-color: #ECECEC;
background-color: #ececec;
display: flex;
flex-direction: column;
// padding-bottom: 100rpx;
@ -229,14 +281,14 @@ export default {
margin-bottom: 60rpx;
.title {
font-size: 30rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
margin-right: 20rpx;
}
.select {
padding: 18rpx 20rpx;
width: 490rpx;
height: 60rpx;
background: rgba(236,236,236,1);
background: rgba(236, 236, 236, 1);
border-radius: 6rpx;
display: flex;
align-items: center;
@ -255,7 +307,7 @@ export default {
align-items: center;
> view {
font-size: 30rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
margin-right: 20rpx;
}
}
@ -265,7 +317,7 @@ export default {
display: flex;
.title {
font-size: 30rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
margin-right: 20rpx;
}
> textarea {
@ -280,10 +332,10 @@ export default {
margin: 90rpx auto 0;
width: 630rpx;
height: 88rpx;
background: rgba(255,120,15,1);
background: rgba(255, 120, 15, 1);
border-radius: 44rpx;
font-size: 36rpx;
color: rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
line-height: 88rpx;
text-align: center;
}
@ -295,8 +347,8 @@ export default {
right: 30rpx;
width: 100rpx;
height: 100rpx;
background: rgba(255,120,15,1);
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255,120,15,0.22);
background: rgba(255, 120, 15, 1);
box-shadow: 0rpx 6rpx 6rpx 0rpx rgba(255, 120, 15, 0.22);
border-radius: 50%;
display: flex;
flex-direction: column;
@ -310,7 +362,7 @@ export default {
}
.text {
font-size: 20rpx;
color: rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
}
}
.confirm-complaint {
@ -321,7 +373,7 @@ export default {
width: 420rpx;
padding: 55rpx 112rpx;
font-size: 28rpx;
color: rgba(51,51,51,1);
color: rgba(51, 51, 51, 1);
line-height: 4r2px;
> view:first-child {
margin-bottom: 20rpx;
@ -330,38 +382,37 @@ export default {
.btn {
width: 200rpx;
height: 60rpx;
background: rgba(255,120,15,1);
background: rgba(255, 120, 15, 1);
border-radius: 30rpx;
text-align: center;
line-height: 60rpx;
font-size: 28rpx;
color: rgba(255,255,255,1);
color: rgba(255, 255, 255, 1);
margin: 0 auto;
}
}
.publish{
.publish {
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: center;
padding: 50rpx 84rpx 31rpx 78rpx;
image{
background-color: #0f0;
image {
}
.list{
.list {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
>view{
> view {
display: flex;
flex-direction: column;
align-items: center;
>image{
> image {
width: 94rpx;
height: 80rpx;
}
>text{
> text {
margin-top: 10rpx;
font-size: 28rpx;
color: #333;
@ -369,7 +420,7 @@ export default {
}
}
}
.off{
.off {
margin-top: 81rpx;
width: 37rpx;
height: 37rpx;

View File

@ -2,43 +2,73 @@
<!-- login页面 -->
<view>
<view class="login">
<image class="images" src=""></image>
<image class="images" :src="url"></image>
<view class="backes"></view>
<view class="content">
<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">
<image src=""></image>
<input v-model="zhanghao" type="tel" placeholder="请输入账号" />
<image src="../../static/image/login/login(3).png"></image>
<input v-model="zhanghao" type="text" placeholder="请输入账号" />
</view>
<view class="labales">
<image src=""></image>
<image src="../../static/image/login/login(1).png"></image>
<input v-model="mima" type="password" placeholder="请输入密码" />
</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 -->
<u-button @click="logins">{{login}}</u-button>
<button @click="logins">{{ login }}</button>
<!-- <u-button :custom-style="customStyle" ></u-button> -->
<u-toast ref="uToast" />
</view>
</view>
</template>
<script>
export default {
export default {
data() {
return {
list: [{
list: [
{
checked: false,
disabled: false
}],
}
],
value: '',
login: '登录',
show: false,
zhanghao:"",
mima:""
zhanghao: 'seller',
mima: '123456',
zhanghaoA: '18953829598 ',
mimaA: '123456',
url: '',
state:0
};
},
methods: {
//
changetab(num){
this.state = num
},
// checkbox
checkboxChange(e) {
//console.log(e);
@ -47,54 +77,73 @@
checkboxGroupChange(e) {
// console.log(e);
},
mask_u(){
this.show = !this.show
mask_u() {
this.show = !this.show;
},
//
getCode(){
console.log("11")
this.loading()
getCode() {
console.log('11');
this.loading();
},
loading(){
},
logins(){
this.$u.api.login({member_name:this.zhanghao,member_password:this.mima}).then((res)=>{
console.log(res)
if(res.errCode != 0){
loading() {},
logins() {
//
uni.clearStorage();
// 10
if(this.state==1){
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({
title: res.message,
type: 'error'
})
}else{
uni.setStorageSync("token",res.data.token)
uni.setStorageSync("userinfo",res.data)
uni.setStorageSync('rongyun',res.data.rongcloud_token)
});
} 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"
})
url: '/pages/index/index',
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'
});
}
});
}
})
}
},
onLoad(){
onLoad() {
let token = uni.getStorageSync('token');
if(token != undefined && token){
if (token != undefined && token) {
this.$u.route({
url:"/pages/index/index"
})
url: '/pages/index/index'
});
}
}
};
};
</script>
<style lang="scss" scoped>
.login {
.login {
// background: url(../../static/pageA/loginbackground.png) no-repeat!important;
.images {
position: fixed;
@ -111,7 +160,6 @@
width: 100%;
height: 100%;
z-index: -1;
}
text {
@ -139,17 +187,28 @@
.more_Login .other {
text-align: right;
}
}
}
.title {
.title {
font-size: 36rpx;
font-weight: bold;
margin-bottom: 150rpx;
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;
z-index: 99999;
margin: 0 auto;
@ -165,7 +224,7 @@
height: 70rpx;
line-height: 70rpx;
position: relative;
input{
input {
width: 80%;
margin-left: 60rpx;
color: #fff;
@ -173,7 +232,7 @@
background-color: none;
}
}
.labales image{
.labales image {
position: absolute;
left: 0;
top: 0;
@ -197,50 +256,51 @@
color: rgba(255, 120, 15, 1);
line-height: 20px;
}
}
.uni-input-input, .uni-input-placeholder{
color:#fff!important;
}
.uni-input-input,
.uni-input-placeholder {
color: #fff !important;
letter-spacing: 2rpx;
}
}
.pact text {
.pact text {
font-size: 22rpx;
font-weight: 400;
color: rgba(255, 255, 255, 1);
line-height: 36px;
}
}
.pact_text {
.pact_text {
font-size: 22px;
font-weight: 400;
color: rgba(129, 188, 253, 1) !important;
line-height: 36px;
}
}
//
.pact {
//
.pact {
position: relative;
padding-left: 40rpx;
overflow:hidden; //
text-overflow:ellipsis; //
white-space:nowrap; //
}
overflow: hidden; //
text-overflow: ellipsis; //
white-space: nowrap; //
}
.u-checkbox-group {
.u-checkbox-group {
position: absolute;
left: 0;
top: 0;
bottom: 0;
margin: auto;
}
}
.u-checkbox__icon--square {
.u-checkbox__icon--square {
border-radius: 50rpx !important;
width: 22rpx;
height: 22rpx;
}
}
.u-btn {
.u-btn {
width: 628rpx;
height: 98rpx;
background: rgba(255, 120, 15, 1) !important;
@ -252,16 +312,16 @@
border: 1px #ff780f solid;
outline: none;
border-color: rgba(255, 120, 15, 1) !important;
}
}
.warp {
.warp {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
}
.rect {
.rect {
width: 558rpx;
height: 300rpx;
background-color: #fff;
@ -270,26 +330,25 @@
zoom: 1;
position: relative;
display: flex;
flex-wrap:wrap;
flex-wrap: wrap;
display: -webkit-flex; /* Safari */
.rect_view{
.rect_view {
width: 100rpx;
height: 100rpx;
.image{
.image {
width: 45rpx;
height: 53rpx;
display: inline-block;
}
flex:1;
flex: 1;
margin-top: 77rpx;
}
.rect_view:nth-child(2) image{
.rect_view:nth-child(2) image {
width: 57rpx;
height: 45rpx;
}
.rect_butoon{
.rect_butoon {
width: 100%;
position: absolute;
bottom: 0;
@ -298,50 +357,51 @@
line-height: 85rpx;
border-top: 1px #999999 solid;
}
view{
view {
color: #666;
font-size:24rpx;
font-size: 24rpx;
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;
}
.rect_view:nth-child(1) image{
}
.rect_view:nth-child(1) image {
margin-right: 20rpx;
}
.rect_view:nth-child(1){
}
.rect_view:nth-child(1) {
position: relative;
margin-right: 79rpx;
}
.rect_view:nth-child(1) view{
}
.rect_view:nth-child(1) view {
position: absolute;
bottom: 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;
}
.rect_view:nth-child(2) image{
}
.rect_view:nth-child(2) image {
margin-left: 20rpx;
}
.rect_view:nth-child(2){
}
.rect_view:nth-child(2) {
position: relative;
}
.rect_view:nth-child(2) view{
}
.rect_view:nth-child(2) view {
position: absolute;
bottom: 0;
left: 0;
}
.title_top {
}
.title_top {
position: fixed;
top: 36rpx;
top: calc(var(--status-bar-height) + 18px);
left: 0;
right: 0;
margin: auto;
font-size:36rpx;
color:rgba(255,255,255,1);
font-size: 36rpx;
color: rgba(255, 255, 255, 1);
text-align: center;
width: 100%;
/* 如果您想让slot内容占满整个导航栏的宽度 */
@ -350,5 +410,17 @@
/* padding: 0 30rpx; */
background: none;
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>

Binary file not shown.

After

Width:  |  Height:  |  Size: 753 B

BIN
static/image/index/live.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB